diff --git a/core/hw/maple/maple_devs.cpp b/core/hw/maple/maple_devs.cpp
index d445a4d38..49ef11eb7 100755
--- a/core/hw/maple/maple_devs.cpp
+++ b/core/hw/maple/maple_devs.cpp
@@ -10,7 +10,7 @@
 #include <jni.h>
 #else
 #define LOGW printf
-#define LOGI() 
+#define LOGI printf
 #endif
 
 #include "deps/zlib/zlib.h"
diff --git a/core/hw/mem/_vmem.cpp b/core/hw/mem/_vmem.cpp
index 3c7677cf2..e54f6a78a 100644
--- a/core/hw/mem/_vmem.cpp
+++ b/core/hw/mem/_vmem.cpp
@@ -571,7 +571,7 @@ error:
 		u32 sz= 512*1024*1024 + sizeof(Sh4RCB) + ARAM_SIZE + 0x10000;
 		void* rv=mmap(0, sz, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
 		munmap(rv,sz);
-		return (u8*)rv + 0x10000 - u32(rv)%0x10000;//align to 64 KB (Needed for linaro mmap not to extend to next region)
+		return (u8*)rv + 0x10000 - unat(rv)%0x10000;//align to 64 KB (Needed for linaro mmap not to extend to next region)
 	}
 #endif
 
diff --git a/core/linux-dist/main.cpp b/core/linux-dist/main.cpp
index 330b8c2c0..44d20c2f7 100755
--- a/core/linux-dist/main.cpp
+++ b/core/linux-dist/main.cpp
@@ -26,6 +26,8 @@
 
 #if !defined(ANDROID)
 	#include <linux/joystick.h>
+	#include <sys/stat.h> 
+	#include <sys/types.h> 
 #endif
 
 #ifdef TARGET_PANDORA
@@ -717,3 +719,6 @@ u32 os_Push(void* frame, u32 samples, bool wait)
 return 1;
 }
 #endif
+
+int get_mic_data(u8* buffer) { return 0; }
+int push_vmu_screen(u8* buffer) { return 0; }
diff --git a/core/linux/common.cpp b/core/linux/common.cpp
index 5a098e919..f05ead9bd 100644
--- a/core/linux/common.cpp
+++ b/core/linux/common.cpp
@@ -41,8 +41,12 @@ struct sigcontext uc_mcontext;
 #define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.pc)
 #endif
 #elif HOST_CPU == CPU_X86
+#ifdef _ANDROID
 #define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.eip)
 #else
+#define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.gregs[REG_EIP])
+#endif
+#else
 #error fix ->pc support
 #endif
 
diff --git a/core/linux/nixprof.cpp b/core/linux/nixprof.cpp
index b6d53126a..7dd97db8d 100644
--- a/core/linux/nixprof.cpp
+++ b/core/linux/nixprof.cpp
@@ -65,8 +65,12 @@ typedef struct ucontext_t
 #define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.pc)
 #endif
 #elif HOST_CPU == CPU_X86
+#ifdef _ANDROID
 #define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.eip)
 #else
+#define GET_PC_FROM_CONTEXT(c) (((ucontext_t *)(c))->uc_mcontext.gregs[REG_EIP])
+#endif
+#else
 #error fix ->pc support
 #endif
 
diff --git a/shell/lin86/Makefile b/shell/lin86/Makefile
new file mode 100644
index 000000000..17143d89f
--- /dev/null
+++ b/shell/lin86/Makefile
@@ -0,0 +1,101 @@
+
+LOCAL_PATH := $(call my-dir)
+FOR_LINUX :=1
+NOT_ARM := 1
+NO_REC := 1
+NO_REND := 1
+
+RZDCY_SRC_DIR = ../../core
+
+include $(RZDCY_SRC_DIR)/core.mk
+
+
+CXX=${CC_PREFIX}g++
+CC=${CC_PREFIX}gcc
+AS=${CC_PREFIX}as
+STRIP=${CC_PREFIX}strip
+
+LD=${CC}
+
+MFLAGS := -m32
+#-marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -funroll-loops
+ASFLAGS := -m32
+#-march=armv7-a -mfpu=neon -mfloat-abi=softfp
+
+LDFLAGS	:= -m32	-g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common 
+
+SOURCES	:=	cfg/ hw/arm7/ hw/aica/ hw/asic/ hw/ hw/gdrom/ hw/maple/ \
+ hw/mem/ hw/pvr/ hw/sh4/ hw/sh4/rec_v2/ plugins/ profiler/ serial_ipc/ \
+ hw/extdev/ hw/arm/ imgread/ linux/ linux-dist/ ./ rec-ARM/ deps/zlib/ deps/chdr/ deps/crypto/ arm_emitter/ 
+
+
+CXXFLAGS :=  -m32 -g -O3  -D RELEASE -c -D TARGET_LINUX_x86 -D USES_HOMEDIR -D HOST_NO_REC -D NO_REND
+CXXFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant 
+CXXFLAGS += -ffast-math -ftree-vectorize 
+#-fprefetch-loop-arrays 
+#-std=c++0x
+
+CXXFLAGS += $(CFLAGS) $(MFLAGS) -fno-exceptions -fno-rtti
+CXXFLAGS += -D SUPPORT_X11
+
+
+ifdef PGO_MAKE
+	CXXFLAGS += -fprofile-generate -pg
+	LDFLAGS	+= -fprofile-generate
+else
+	CXXFLAGS += -fomit-frame-pointer
+endif
+
+ifdef PGO_USE
+	CXXFLAGS += -fprofile-use
+endif
+
+
+ifdef LTO_TEST
+	CXXFLAGS += -flto -fwhole-program 
+	LDFLAGS +=-flto -fwhole-program 
+endif
+
+INCS	:= -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos -I../linux-deps/include
+
+LIBS    := -L../linux-deps/lib/x86 -L./enta_viv 
+#LIBS	+= -lglapi
+LIBS    += -lm -lrt -lEGL -lGLESv2 #-lglslcompiler -lIMGegl -lpvr2d -lsrv_um
+LIBS    += -lpthread -lasound -lX11 -lXdmcp -lXau
+
+
+OBJECTS=$(RZDCY_FILES:.cpp=.build_obj)
+OBJECTS:=$(OBJECTS:.c=.build_obj)
+OBJECTS:=$(OBJECTS:.S=.build_obj)
+OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,obj/%,$(OBJECTS))
+
+
+EXECUTABLE_STRIPPED=nosym-reicast.elf
+EXECUTABLE=reicast.elf
+
+PACKAGE_FILES=$(EXECUTABLE_STRIPPED) default.gcw0.desktop icon-32.png
+
+all: $(CPPFILES) $(EXECUTABLE) $(EXECUTABLE_STRIPPED)
+	
+$(EXECUTABLE): $(OBJECTS)
+	echo $(RZDCY_FILES)
+	$(CXX) $(MFLAGS) $(EXTRAFLAGS) $(LDFLAGS)  $(OBJECTS) $(LIBS) -o $@
+
+$(EXECUTABLE_STRIPPED): $(EXECUTABLE)
+	cp $< $@ && $(STRIP) $@
+
+obj/%.build_obj : $(RZDCY_SRC_DIR)/%.cpp
+	mkdir -p $(dir $@)
+	$(CXX) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $< -o $@
+	
+obj/%.build_obj : $(RZDCY_SRC_DIR)/%.c
+	mkdir -p $(dir $@)
+	$(CC) $(EXTRAFLAGS) $(INCS) $(CXXFLAGS) $< -o $@
+
+obj/%.build_obj : $(RZDCY_SRC_DIR)/%.S
+	mkdir -p $(dir $@)	
+	$(AS) $(ASFLAGS) $(INCS) $< -o $@
+
+
+clean:
+	rm $(OBJECTS) $(EXECUTABLE) -f