diff --git a/Android.mk b/Android.mk
new file mode 100755
index 0000000..5053e7d
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk
new file mode 100755
index 0000000..dcfaae9
--- /dev/null
+++ b/cl_dll/Android.mk
@@ -0,0 +1,105 @@
+#hlsdk-2.3 client port for android
+#Copyright (c) mittorn
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := client
+#ifeq ($(XASH_SDL),1)
+#APP_PLATFORM := android-12
+#LOCAL_SHARED_LIBRARIES += SDL2 
+#LOCAL_CFLAGS += -DXASH_SDL
+#else
+APP_PLATFORM := android-8
+#endif
+LOCAL_CONLYFLAGS += -std=c99
+
+include $(XASH3D_CONFIG)
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a-hard)
+LOCAL_MODULE_FILENAME = libclient_hardfp
+endif
+
+LOCAL_CFLAGS += -fsigned-char -DCLIENT_DLL=1
+
+SRCS+=../dlls/crossbow.cpp
+SRCS+=../dlls/crowbar.cpp
+SRCS+=../dlls/egon.cpp
+SRCS+=./ev_hldm.cpp
+SRCS+=../dlls/gauss.cpp
+SRCS+=../dlls/handgrenade.cpp
+SRCS+=./hl/hl_baseentity.cpp
+SRCS+=./hl/hl_events.cpp
+SRCS+=./hl/hl_objects.cpp
+SRCS+=./hl/hl_weapons.cpp
+SRCS+=../dlls/wpn_shared/hl_wpn_glock.cpp
+SRCS+=../dlls/hornetgun.cpp
+SRCS+=../common/interface.cpp
+SRCS+=../dlls/mp5.cpp
+SRCS+=../dlls/python.cpp
+SRCS+=../dlls/rpg.cpp
+SRCS+=../dlls/satchel.cpp
+SRCS+=../dlls/shotgun.cpp
+SRCS+=../dlls/squeakgrenade.cpp
+SRCS+=../dlls/tripmine.cpp
+#SRCS+=../game_shared/voice_banmgr.cpp
+#SRCS+=../game_shared/voice_status.cpp
+SRCS+=./ammo.cpp
+SRCS+=./ammo_secondary.cpp
+SRCS+=./ammohistory.cpp
+SRCS+=./battery.cpp
+SRCS+=./cdll_int.cpp
+SRCS+=./com_weapons.cpp
+SRCS+=./death.cpp
+SRCS+=./demo.cpp
+SRCS+=./entity.cpp
+SRCS+=./ev_common.cpp
+SRCS+=./events.cpp
+SRCS+=./flashlight.cpp
+SRCS+=./GameStudioModelRenderer.cpp
+SRCS+=./geiger.cpp
+SRCS+=./health.cpp
+SRCS+=./hud.cpp
+SRCS+=./hud_msg.cpp
+SRCS+=./hud_redraw.cpp
+#SRCS+=./hud_servers.cpp
+SRCS+=./hud_spectator.cpp
+SRCS+=./hud_update.cpp
+SRCS+=./in_camera.cpp
+SRCS+=./input.cpp
+#SRCS+=./inputw32.cpp
+SRCS+=./menu.cpp
+SRCS+=./message.cpp
+SRCS+=./overview.cpp
+SRCS+=./parsemsg.cpp
+SRCS_C+=../pm_shared/pm_debug.c
+SRCS_C+=../pm_shared/pm_math.c
+SRCS_C+=../pm_shared/pm_shared.c
+SRCS+=./saytext.cpp
+SRCS+=./status_icons.cpp
+SRCS+=./statusbar.cpp
+SRCS+=./studio_util.cpp
+SRCS+=./StudioModelRenderer.cpp
+SRCS+=./text_message.cpp
+SRCS+=./train.cpp
+SRCS+=./tri.cpp
+SRCS+=./util.cpp
+SRCS+=./view.cpp
+SRCS+=./input_xash3d.cpp
+SRCS+=./scoreboard.cpp
+SRCS+=./MOTD.cpp
+INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls
+DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -fpermissive -w
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
+		 $(LOCAL_PATH)/../common \
+		 $(LOCAL_PATH)/../engine \
+		 $(LOCAL_PATH)/../game_shared \
+		 $(LOCAL_PATH)/../dlls \
+		 $(LOCAL_PATH)/../pm_shared
+LOCAL_CFLAGS += $(DEFINES) $(INCLUDES)
+
+LOCAL_SRC_FILES := $(SRCS) $(SRCS_C)
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/cl_dll/Makefile b/cl_dll/Makefile
index d3963a5..55b6736 100644
--- a/cl_dll/Makefile
+++ b/cl_dll/Makefile
@@ -66,7 +66,8 @@ SRCS+=./view.cpp
 SRCS+=./input_xash3d.cpp
 SRCS+=./scoreboard.cpp
 SRCS+=./MOTD.cpp
-DEFINES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -I../dlls/ -fpermissive -w
+INCLUDES =  -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls
+DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -fpermissive -w
 CFLAGS = -Og -ggdb
 OBJS = $(SRCS:.cpp=.o) $(SRCS_C:.c=.o)
 %.o : %.c