diff --git a/sample_mm/Makefile b/sample_mm/Makefile
index 8cfdc8b..99596ca 100755
--- a/sample_mm/Makefile
+++ b/sample_mm/Makefile
@@ -25,6 +25,7 @@ INCLUDE = -I. -I..
 ifeq "$(ENGINE)" "original"
 	HL2SDK = $(HL2SDK_ORIG)
 	HL2PUB = $(HL2SDK_ORIG)/public
+	HL2LIB = $(HL2SDK_ORIG)/linux_sdk
 	CFLAGS += -DENGINE_ORIGINAL
 	METAMOD = $(SOURCEMM14)
 	INCLUDE += -I$(HL2SDK)/public/dlls
@@ -33,6 +34,7 @@ endif
 ifeq "$(ENGINE)" "orangebox"
 	HL2SDK = $(HL2SDK_OB)
 	HL2PUB = $(HL2SDK_OB)/public
+	HL2LIB = $(HL2SDK_OB)/lib/linux
 	CFLAGS += -DENGINE_ORANGEBOX
 	METAMOD = $(SOURCEMM16)
 	INCLUDE += -I$(HL2SDK)/public/game/server
@@ -43,7 +45,7 @@ ifeq "$(ENGINE)" ""
 	false
 endif
 
-LINK += $(HL2SDK)/linux_sdk/tier1_i486.a vstdlib_i486.so tier0_i486.so
+LINK += $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so
 
 INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 \
 	-I$(HL2PUB)/tier1 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) \
diff --git a/sourcemm/Makefile b/sourcemm/Makefile
index 392b6d5..c632d96 100644
--- a/sourcemm/Makefile
+++ b/sourcemm/Makefile
@@ -14,12 +14,12 @@ CPP = gcc-4.1
 BINARY = server_i486.so
 
 HL2PUB = $(HL2SDK)/public
-HL2LIB = $(HL2SDK)/linux_sdk
+HL2LIB = $(HL2SDK)/lib/linux
 
 OBJECTS = metamod.cpp metamod_util.cpp metamod_console.cpp metamod_oslink.cpp metamod_plugins.cpp \
 	sourcehook.cpp sourcehook_hookmangen.cpp episode2/console.cpp episode2/provider_ep2.cpp episode2/vsp_listener.cpp
 
-LINK = $(HL2SDK)/linux_sdk/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc
+LINK = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc
 
 INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/game/server -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
           -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_ROOT) -I$(SMM_ROOT)/sourcehook
diff --git a/stub_mm/Makefile b/stub_mm/Makefile
index b2d4b33..dcb03bb 100644
--- a/stub_mm/Makefile
+++ b/stub_mm/Makefile
@@ -25,6 +25,7 @@ INCLUDE = -I. -I..
 ifeq "$(ENGINE)" "original"
 	HL2SDK = $(HL2SDK_ORIG)
 	HL2PUB = $(HL2SDK_ORIG)/public
+	HL2LIB = $(HL2SDK_ORIG)/linux_sdk
 	CFLAGS += -DENGINE_ORIGINAL
 	METAMOD = $(SOURCEMM14)
 	INCLUDE += -I$(HL2SDK)/public/dlls
@@ -33,6 +34,7 @@ endif
 ifeq "$(ENGINE)" "orangebox"
 	HL2SDK = $(HL2SDK_OB)
 	HL2PUB = $(HL2SDK_OB)/public
+	HL2LIB = $(HL2SDK_OB)/lib/linux
 	CFLAGS += -DENGINE_ORANGEBOX
 	METAMOD = $(SOURCEMM16)
 	INCLUDE += -I$(HL2SDK)/public/game/server
@@ -43,7 +45,7 @@ ifeq "$(ENGINE)" ""
 	false
 endif
 
-LINK += $(HL2SDK)/linux_sdk/tier1_i486.a vstdlib_i486.so tier0_i486.so
+LINK += $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so
 
 INCLUDE += -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 \
 	-I$(HL2PUB)/tier1 -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) \