diff --git a/Makefile b/Makefile
index 33b0f76fd6..77f0b900a4 100644
--- a/Makefile
+++ b/Makefile
@@ -377,7 +377,7 @@ GIT-VERSION-FILE: FORCE
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
 
-CFLAGS = -g -O2 -Wall
+CFLAGS = -g -Wall
 LDFLAGS =
 ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
diff --git a/config.mak.uname b/config.mak.uname
index ac81fddf6f..61006490c4 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -545,8 +545,6 @@ else
 		prefix = /usr/
 		# Enable DEP
 		BASIC_LDFLAGS += -Wl,--nxcompat
-		# Enable ASLR
-		BASIC_LDFLAGS += -Wl,--dynamicbase
 		ifeq (MINGW32,$(MSYSTEM))
 			prefix = /mingw32
 			BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup