diff --git a/Makefile b/Makefile
index 77f0b900a4..33b0f76fd6 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 -Wall
+CFLAGS = -g -O2 -Wall
 LDFLAGS =
 ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
diff --git a/config.mak.uname b/config.mak.uname
index 61006490c4..ac81fddf6f 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -545,6 +545,8 @@ 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