diff --git a/shell/lin86/Makefile b/shell/lin86/Makefile
deleted file mode 100644
index 6dfeff82d..000000000
--- a/shell/lin86/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-
-LOCAL_PATH := $(call my-dir)
-FOR_LINUX :=1
-NOT_ARM := 1
-X86_REC := 1
-#NO_REC := 1
-#NO_REND := 1
-WEBUI :=1 
-USE_ALSA := 1
-USE_OSS := 1
-#USE_PULSEAUDIO := 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 := -32
-#-march=armv7-a -mfpu=neon -mfloat-abi=softfp
-
-LDFLAGS := -m32
-LDFLAGS += -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common
-
-CFLAGS := -m32
-CFLAGS += -g -O3 -D RELEASE -c -D TARGET_LINUX_x86 -D USES_HOMEDIR -D TARGET_NO_AREC #-D NO_REND
-CFLAGS += -D SUPPORT_X11
-CFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant 
-CFLAGS += -ffast-math -ftree-vectorize 
-
-
-#-fprefetch-loop-arrays 
-#-std=c++0x
-CXXFLAGS += $(CFLAGS) $(MFLAGS) -fno-exceptions -fno-rtti -fpermissive
-CXXFLAGS += -D SUPPORT_X11 
-
-ifdef PGO_MAKE
-	CFLAGS += -fprofile-generate -pg
-	LDFLAGS	+= -fprofile-generate
-else
-	CFLAGS += -fomit-frame-pointer
-endif
-
-ifdef PGO_USE
-	CFLAGS += -fprofile-use
-endif
-
-ifdef LTO_TEST
-	CFLAGS += -flto -fwhole-program 
-	LDFLAGS +=-flto -fwhole-program 
-endif
-
-INCS	:= -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos
-
-LIBS    := # use system libs
-LIBS    += -lm -lrt -ldl
-LIBS    += -lpthread -lX11
-
-ifdef USE_ALSA
-	CXXFLAGS += -D USE_ALSA
-	LIBS += -lasound
-endif
-
-ifdef USE_OSS
-	CXXFLAGS += -D USE_OSS
-endif
-
-ifdef USE_PULSEAUDIO
-	CXXFLAGS += -D USE_PULSEAUDIO
-	LIBS += -lpulse-simple
-endif
-
-# GLES on x11?
-ifdef USE_GLES
-	CXXFLAGS += -DGLES
-	LIBS	+= -lEGL -lGLESv2
-else
-	LIBS	+= -ldl -lGL #for desktop gl
-endif
-
-
-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)
-	$(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) $(CFLAGS) $(CXXFLAGS) $< -o $@
-	
-obj/%.build_obj : $(RZDCY_SRC_DIR)/%.c
-	mkdir -p $(dir $@)
-	$(CC) $(EXTRAFLAGS) $(INCS) $(CFLAGS) $< -o $@
-
-obj/%.build_obj : $(RZDCY_SRC_DIR)/%.S
-	mkdir -p $(dir $@)	
-	$(AS) $(ASFLAGS) $(INCS) $< -o $@
-
-
-clean:
-	rm $(OBJECTS) $(EXECUTABLE) -f
diff --git a/shell/lin64/Makefile b/shell/linux/Makefile
similarity index 81%
rename from shell/lin64/Makefile
rename to shell/linux/Makefile
index 5f4bdc8df..35da3f8be 100644
--- a/shell/lin64/Makefile
+++ b/shell/linux/Makefile
@@ -2,7 +2,7 @@
 LOCAL_PATH := $(call my-dir)
 FOR_LINUX :=1
 NOT_ARM := 1
-X64_REC := 1
+
 #NO_REC := 1
 #NO_REND := 1
 WEBUI :=1 
@@ -10,11 +10,32 @@ USE_ALSA := 1
 USE_OSS := 1
 #USE_PULSEAUDIO := 1
 
+MFLAGS := 
+ASFLAGS := 
+LDFLAGS :=
+CFLAGS := 
+CXXFLAGS :=
+
+ifeq (,$(ARCH))
+	ARCH = $(shell uname -m)
+endif
+
+ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
+		X86_REC := 1
+		MFLAGS += -m32
+		ASFLAGS += -32
+		LDFLAGS += -m32
+		CFLAGS += -m32 -D TARGET_LINUX_x86
+		CXXFLAGS += -fno-exceptions
+else
+		X64_REC := 1
+		CFLAGS += -D TARGET_LINUX_x64
+		CXXFLAGS += -fexceptions
+endif
+
 RZDCY_SRC_DIR = ../../core
-
 include $(RZDCY_SRC_DIR)/core.mk
 
-
 CXX=${CC_PREFIX}g++
 CC=${CC_PREFIX}gcc
 AS=${CC_PREFIX}as
@@ -22,26 +43,15 @@ STRIP=${CC_PREFIX}strip
 
 LD=${CC}
 
-MFLAGS := #-m32
-#-marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp -funroll-loops
-ASFLAGS := 
-#-march=armv7-a -mfpu=neon -mfloat-abi=softfp
-
-LDFLAGS := 
 LDFLAGS += -g -Wl,-Map,$(notdir $@).map,--gc-sections -Wl,-O3 -Wl,--sort-common
 
-CFLAGS := 
-CFLAGS += -g -O3 -D RELEASE -c -D TARGET_LINUX_x86 -D USES_HOMEDIR -D TARGET_NO_AREC #-D NO_REND
+CFLAGS += -g -O3 -D RELEASE -c -D USES_HOMEDIR -D TARGET_NO_AREC #-D NO_REND
 CFLAGS += -D SUPPORT_X11
 CFLAGS += -frename-registers -fno-strict-aliasing -fsingle-precision-constant 
 CFLAGS += -ffast-math -ftree-vectorize 
 
-
-#-fprefetch-loop-arrays 
-#-std=c++0x
-CXXFLAGS += $(CFLAGS) $(MFLAGS) -fexceptions -fno-rtti -fpermissive
+CXXFLAGS += $(CFLAGS) $(MFLAGS) -fno-rtti -fpermissive -fno-operator-names
 CXXFLAGS += -D SUPPORT_X11 
-CXXFLAGS += -fno-operator-names
 
 ifdef PGO_MAKE
 	CFLAGS += -fprofile-generate -pg