diff --git a/core/Makefile.ep1 b/core/Makefile.ep1
index 98cb8960..1a0dc013 100644
--- a/core/Makefile.ep1
+++ b/core/Makefile.ep1
@@ -13,7 +13,7 @@ GCC4_FLAGS = -fvisibility=hidden
 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc-4.1
-BINARY = sourcemod_mm_i486.so
+BINARY = sourcemod.2.ep1.so
 
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
@@ -82,8 +82,6 @@ all:
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
 	$(MAKE) -f Makefile.ep1 sourcemod
-	rm -rf $(BINARY)
-	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
 
 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
 	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
diff --git a/core/Makefile.ep2 b/core/Makefile.ep2
index 64e25aa1..5d59cbb0 100644
--- a/core/Makefile.ep2
+++ b/core/Makefile.ep2
@@ -13,7 +13,7 @@ GCC4_FLAGS = -fvisibility=hidden
 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc-4.1
-BINARY = sourcemod_mm_i486.so
+BINARY = sourcemod.2.ep2.so
 
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
@@ -81,15 +81,13 @@ all:
 	mkdir -p $(BIN_DIR)/thread
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
-	$(MAKE) -f Makefile.ep1 sourcemod
-	rm -rf $(BINARY)
-	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
+	$(MAKE) -f Makefile.ep2 sourcemod
 
 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
 	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 debug:	
-	$(MAKE) -f Makefile.ep1 all DEBUG=true
+	$(MAKE) -f Makefile.ep2 all DEBUG=true
 
 default: all
 
diff --git a/core/Makefile.orig b/core/Makefile.orig
index d860e7cc..8d83e0c0 100644
--- a/core/Makefile.orig
+++ b/core/Makefile.orig
@@ -13,7 +13,7 @@ GCC4_FLAGS = -fvisibility=hidden
 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc-4.1
-BINARY = sourcemod_mm_i486.so
+BINARY = sourcemod.1.ep1.so
 
 HL2PUB = $(HL2SDK)/public
 HL2LIB = $(HL2SDK)/linux_sdk
@@ -81,15 +81,13 @@ all:
 	mkdir -p $(BIN_DIR)/thread
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
-	$(MAKE) -f Makefile.ep1 sourcemod
-	rm -rf $(BINARY)
-	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
+	$(MAKE) -f Makefile.orig sourcemod
 
 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
 	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 debug:	
-	$(MAKE) -f Makefile.ep1 all DEBUG=true
+	$(MAKE) -f Makefile.orig all DEBUG=true
 
 default: all
 
diff --git a/core/smn_vector.cpp b/core/smn_vector.cpp
index ef52e969..705740ee 100644
--- a/core/smn_vector.cpp
+++ b/core/smn_vector.cpp
@@ -183,7 +183,7 @@ static cell_t NormalizeVector(IPluginContext *pContext, const cell_t *params)
 
 //:TODO: OMG remove this when we get the OB SDK!!1
 // as well as bitbuf.cpp (i write it here just to remind it)
-#if defined ORANGEBOX_BUILD
+#if defined ORANGEBOX_BUILD && !defined __linux__
 float ham(float _X)
 {
 	return sqrt(_X);