diff --git a/Makefile b/Makefile
index 7acf0450..17b5a70b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,20 @@ PRODUCT_NAME:=freelan
 PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n')
 PRODUCT_BIN_PREFIX?=/usr/local
 PRODUCT_PREFIX?=/usr/local
+USE_UPNP?=yes
+USE_MONGOOSE?=no
+MAKE_JOBS?=1
 
 default: build
 
+.PHONY: build install
+
 build:
-	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX} --upnp=${USE_UPNP} --mongoose=${USE_MONGOOSE} -j${MAKE_JOBS}
 
 install:
 	# Install the files to $(DESTDIR) (defaults to /)
-	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX} --upnp=${USE_UPNP} --mongoose=${USE_MONGOOSE} -j${MAKE_JOBS}
 
 package:
 	git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ -o ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz