diff --git a/actioncube.sh b/actioncube.sh
index 596d49a8..11e461a2 100755
--- a/actioncube.sh
+++ b/actioncube.sh
@@ -36,5 +36,5 @@ ppc)
 esac
 
 cd ${CUBE_DIR}
-exec ${CUBE_DIR}/bin/ac_client $*
+exec ${CUBE_DIR}/bin_unix/ac_client $*
 
diff --git a/actioncube_server.sh b/actioncube_server.sh
new file mode 100755
index 00000000..6db5fd18
--- /dev/null
+++ b/actioncube_server.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# CUBE_DIR should refer to the directory in which Cube is placed.
+#CUBE_DIR=~/cube
+#CUBE_DIR=/usr/local/lib/cube
+CUBE_DIR=./
+
+# SYSTEM_NAME should be set to the name of your operating system.
+#SYSTEM_NAME=Linux
+SYSTEM_NAME=`uname -s`
+
+# MACHINE_NAME should be set to the name of your processor.
+#MACHINE_NAME=i686
+MACHINE_NAME=`uname -m`
+
+case ${SYSTEM_NAME} in
+Linux)
+  SYSTEM_PREFIX=linux_
+  ;;
+*)
+  echo "Your operating system does not have a supported Cube client."
+  exit 1
+  ;;
+esac
+
+case ${MACHINE_NAME} in
+i486|i586|i686)
+  MACHINE_PREFIX=
+  ;;
+ppc)
+  MACHINE_PREFIX=ppc_
+  ;;
+*)
+  echo "Your processor does not have a supported Cube client."
+  exit 1
+  ;;
+esac
+
+cd ${CUBE_DIR}
+exec ${CUBE_DIR}/bin_unix/ac_server -c6 $*
+
diff --git a/source/src/Makefile b/source/src/Makefile
index 21fa2cae..901e7324 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -1,71 +1,71 @@
-CXX=g++
-CXXOPTFLAGS=-Wall -O3 -fsigned-char -fomit-frame-pointer -fpermissive
-CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` -Wno-deprecated
-
-CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU 
-CLIENT_OBJS= \
-	client.o \
-	clientextras.o \
-	clientgame.o \
-	clients2c.o \
-	command.o \
-	console.o \
-	editing.o \
-	entities.o \
-	main.o \
-	menus.o \
-	physics.o \
-	rendercubes.o \
-	renderextras.o \
-	rendergl.o \
-	rendermd2.o \
-        rendermd3.o \
-	renderparticles.o \
-	rendertext.o \
-	rndmap.o \
-	savegamedemo.o \
-	server.o \
-	serverbrowser.o \
-	serverms.o \
-	serverutil.o \
-	sound.o \
-	tools.o \
-	weapon.o \
-	world.o \
-	worldio.o \
-	worldlight.o \
-	worldocull.o \
-	worldrender.o \
-   bot/bot.o \
-   bot/botmanager.o \
-   bot/bot_ai.o \
-   bot/bot_util.o \
-   bot/bot_waypoint.o \
-   bot/ac_bot.o \
-   bot/ac_bot_ai.o 
-
-
-SERVER_LIBS=-L../enet -lenet
-SERVER_FILES= \
-	serverms.cpp \
+CXX=g++
+CXXOPTFLAGS=-Wall -O3 -fsigned-char -fomit-frame-pointer -fpermissive
+CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags` -Wno-deprecated
+
+CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU 
+CLIENT_OBJS= \
+	client.o \
+	clientextras.o \
+	clientgame.o \
+	clients2c.o \
+	command.o \
+	console.o \
+	editing.o \
+	entities.o \
+	main.o \
+	menus.o \
+	physics.o \
+	rendercubes.o \
+	renderextras.o \
+	rendergl.o \
+	rendermd2.o \
+        rendermd3.o \
+	renderparticles.o \
+	rendertext.o \
+	rndmap.o \
+	savegamedemo.o \
+	server.o \
+	serverbrowser.o \
+	serverms.o \
+	serverutil.o \
+	sound.o \
+	tools.o \
+	weapon.o \
+	world.o \
+	worldio.o \
+	worldlight.o \
+	worldocull.o \
+	worldrender.o \
+   bot/bot.o \
+   bot/botmanager.o \
+   bot/bot_ai.o \
+   bot/bot_util.o \
+   bot/bot_waypoint.o \
+   bot/ac_bot.o \
+   bot/ac_bot_ai.o 
+
+
+SERVER_LIBS=-L../enet -lenet
+SERVER_FILES= \
+	serverms.cpp \
 	server.cpp \
-	serverutil.cpp \
-	tools.cpp
-
-default: all
-
-all: enet client server
-
-enet:
-	-make -C ../enet all
-
-clean:
-	-rm -f $(SERVER_OBJS) $(CLIENT_OBJS) ../../bin/ac_server ../../bin/ac_client
-#	-make -C ../enet/ clean
-
-client: $(CLIENT_OBJS)
-	$(CXX) $(CXXFLAGS) -o ../../bin/ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-
-server: $(SERVER_FILES)
-	$(CXX) $(CXXFLAGS) -o ../../bin/ac_server -DSTANDALONE $(SERVER_FILES) $(SERVER_LIBS)
-	
+	serverutil.cpp \
+	tools.cpp
+
+default: all
+
+all: enet client server
+
+enet:
+	-make -C ../enet all
+
+clean:
+	-rm -f $(SERVER_OBJS) $(CLIENT_OBJS) ac_server ac_client
+#	-make -C ../enet/ clean
+
+client: $(CLIENT_OBJS)
+	$(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
+
+server: $(SERVER_FILES)
+	$(CXX) $(CXXFLAGS) -o ac_server -DSTANDALONE $(SERVER_FILES) $(SERVER_LIBS)
+