diff --git a/setup.py b/setup.py
index bfb4b114a..ee84826eb 100644
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ if not OS == "win":
 	EXTRA_COMPILE_ARGS = ["-Wno-missing-braces", "-DHAVE_INCLUDE_LIBTORRENT_ASIO____ASIO_HPP=1", 
 				"-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1", 
 				"-DHAVE_INCLUDE_LIBTORRENT_ASIO_IP_TCP_HPP=1", 
-				"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", "-DNDEBUG"]
+				"-DHAVE_PTHREAD=1", "-DTORRENT_USE_OPENSSL=1", "-DHAVE_SSL=1", "-DNDEBUG", "-O2"]
 	if ARCH == "x64":
 		EXTRA_COMPILE_ARGS.append("-DAMD64")
 
@@ -116,22 +116,17 @@ if not OS == "win":
 		boosttype = 'nomt'
 	else:
 		boosttype = 'mt'
-	removals = ['-g', '-Wstrict-prototypes']
-        additions = ['-DNDEBUG', '-O2']
+	removals = ['-DNDEBUG', '-g', '-Wstrict-prototypes']
 
 	if python_version == '2.5':
 		cv_opt = sysconfig.get_config_vars()["CFLAGS"]
 		for removal in removals:
 			cv_opt = cv_opt.replace(removal, " ")
-		for addition in additions:
-			cv_opt = cv_opt + " " + addition
 		sysconfig.get_config_vars()["CFLAGS"] = ' '.join(cv_opt.split())
 	else:
 		cv_opt = sysconfig.get_config_vars()["OPT"]
 		for removal in removals:
 			cv_opt = cv_opt.replace(removal, " ")
-		for addition in additions:
-			cv_opt = cv_opt + " " + addition
 		sysconfig.get_config_vars()["OPT"] = ' '.join(cv_opt.split())
 else:
 	boosttype = 'mt'