diff --git a/Makefile b/Makefile
index fe8ae7e..fc8abda 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ DEPS := obj/make.dep
 
 include filelist.mk
 
-USE_AESNI  := yes
+USE_AESNI  := no
 USE_STATIC := no
-USE_UPNP   := no
+USE_UPNP   := yes
 
 ifeq ($(UNAME),Darwin)
 	DAEMON_SRC += DaemonLinux.cpp