diff --git a/Makefile b/Makefile
index 64292e30..c0c616a5 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ ifeq ($(COMPILE_PLATFORM),darwin)
   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/)
 endif
 
+ifndef BUILD_ELITEFORCE
+  BUILD_ELITEFORCE = 1
+endif
 ifndef BUILD_STANDALONE
   BUILD_STANDALONE =
 endif
@@ -33,10 +36,18 @@ ifndef BUILD_GAME_QVM
   BUILD_GAME_QVM   =
 endif
 ifndef BUILD_BASEGAME
-  BUILD_BASEGAME =
+  ifeq ($(BUILD_ELITEFORCE),1)
+    BUILD_BASEGAME = 0
+  else
+    BUILD_BASEGAME =
+  endif
 endif
 ifndef BUILD_MISSIONPACK
-  BUILD_MISSIONPACK=
+  ifeq ($(BUILD_ELITEFORCE),1)
+    BUILD_MISSIONPACK= 0
+  else
+    BUILD_MISSIONPACK=
+  endif
 endif
 ifndef BUILD_RENDERER_OPENGL2
   BUILD_RENDERER_OPENGL2=
@@ -104,11 +115,19 @@ ifndef VERSION
 endif
 
 ifndef CLIENTBIN
-CLIENTBIN=ioquake3
+  ifeq ($(BUILD_ELITEFORCE),1)
+    CLIENTBIN=iostvoyHM
+  else
+    CLIENTBIN=ioquake3
+  endif
 endif
 
 ifndef SERVERBIN
-SERVERBIN=ioq3ded
+  ifeq ($(BUILD_ELITEFORCE),1)
+    SERVERBIN=iostvefded
+  else
+    SERVERBIN=ioq3ded
+  endif
 endif
 
 ifndef BASEGAME