diff --git a/dlls/cstrike/Makefile b/dlls/cstrike/Makefile
index 126608c4..629c3bae 100755
--- a/dlls/cstrike/Makefile
+++ b/dlls/cstrike/Makefile
@@ -9,14 +9,17 @@ MM_ROOT = ../metamod/metamod
 OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
-NAME = cstrike_amxx
+NAME = cstrike
+
+BIN_SUFFIX_32 = amxx_i386.so
+BIN_SUFFIX_64 = amxx_amd64.so
 
 OBJECTS = CstrikePlayer.cpp cstrike.cpp amxxmodule.cpp
 
 LINK = 
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
-	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
+	-I$(MM_ROOT) -I$(HLSDK)/common
 
 ifeq "$(DEBUG)" "true"
 	BIN_DIR = Debug
@@ -29,12 +32,12 @@ endif
 CFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc
 
 ifeq "$(AMD64)" "true"
-	BINARY = $(NAME)_amd64.so
+	BINARY = $(NAME)_$(BIN_SUFFIX_64)
 	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 
 else
-	BINARY = $(NAME)_i386.so
+	BINARY = $(NAME)_$(BIN_SUFFIX_32)
 	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
-	OPT_FLAGS += -march=i686
+	OPT_FLAGS += -march=i586
 endif
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@@ -59,7 +62,8 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(BINARY)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(BINARY)
-
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)