diff --git a/actioncube.bat b/actioncube.bat
index 74069766..0a79b6ac 100755
--- a/actioncube.bat
+++ b/actioncube.bat
@@ -1,3 +1,3 @@
-bin_win32\ac_client.exe -w1024 -h768 $@
+bin_win32\ac_client.exe -w1024 -h768 %1 %2 %3 %4 %5
 
 
diff --git a/actioncube.sh b/actioncube.sh
index 11e461a2..49711e63 100755
--- a/actioncube.sh
+++ b/actioncube.sh
@@ -14,10 +14,10 @@ MACHINE_NAME=`uname -m`
 
 case ${SYSTEM_NAME} in
 Linux)
-  SYSTEM_PREFIX=linux_
+  SYSTEM_PREFIX=
   ;;
 *)
-  echo "Your operating system does not have a supported Cube client."
+  echo "Your operating system does not have a pre-compiled Cube client."
   exit 1
   ;;
 esac
@@ -26,15 +26,12 @@ case ${MACHINE_NAME} in
 i486|i586|i686)
   MACHINE_PREFIX=
   ;;
-ppc)
-  MACHINE_PREFIX=ppc_
-  ;;
 *)
-  echo "Your processor does not have a supported Cube client."
+  echo "Your processor does not have a pre-compiled Cube client."
   exit 1
   ;;
 esac
 
 cd ${CUBE_DIR}
-exec ${CUBE_DIR}/bin_unix/ac_client $*
+exec ${CUBE_DIR}/bin_unix/${MACHINE_PREFIX}${SYSTEM_PREFIX}ac_client $*
 
diff --git a/actioncube_server.bat b/actioncube_server.bat
index 23fcc1a0..7fbca584 100644
--- a/actioncube_server.bat
+++ b/actioncube_server.bat
@@ -1,2 +1,2 @@
-bin_win32\ac_server.exe -c6 -rconfig/maprot.cfg $@
+bin_win32\ac_server.exe %1 %2 %3 %4 %5
 pause
diff --git a/actioncube_server.sh b/actioncube_server.sh
index 6db5fd18..6b7765d7 100755
--- a/actioncube_server.sh
+++ b/actioncube_server.sh
@@ -14,10 +14,10 @@ MACHINE_NAME=`uname -m`
 
 case ${SYSTEM_NAME} in
 Linux)
-  SYSTEM_PREFIX=linux_
+  SYSTEM_PREFIX=
   ;;
 *)
-  echo "Your operating system does not have a supported Cube client."
+  echo "Your operating system does not have a pre-compiled Cube server."
   exit 1
   ;;
 esac
@@ -26,15 +26,12 @@ case ${MACHINE_NAME} in
 i486|i586|i686)
   MACHINE_PREFIX=
   ;;
-ppc)
-  MACHINE_PREFIX=ppc_
-  ;;
 *)
-  echo "Your processor does not have a supported Cube client."
+  echo "Your processor does not have a pre-compiled Cube server."
   exit 1
   ;;
 esac
 
 cd ${CUBE_DIR}
-exec ${CUBE_DIR}/bin_unix/ac_server -c6 $*
+exec ${CUBE_DIR}/bin_unix/${MACHINE_PREFIX}${SYSTEM_PREFIX}ac_server $*