diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index 492f5ad449..663df4acda 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -156,7 +156,7 @@ if (OS == "windows") then
 
 else -- Non-Windows, = Unix
 
-	tinsert(package.files, sourcesfromdirs(sourceroot.."lib/sysdep/unix"))
+	tinsert(package.files, sourcesfromdirs(sourceroot, "lib/sysdep/unix"))
 
 	-- Libraries
 	package.links = {
diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh
index afa5f42b6f..59f72b7fa5 100755
--- a/build/workspaces/update-workspaces.sh
+++ b/build/workspaces/update-workspaces.sh
@@ -1,19 +1,32 @@
 #!/bin/sh
 
-cd premake
+# build/workspaces/
 
-./premake --target gnu
+start_dir=$(pwd)
+premake_dir=$(pwd)/../premake
+workspace_dir=$(pwd)/gcc
 
-mkdir -p ../gcc
-cd ../gcc
-mv -f ../premake/Makefile ../premake/prometheus.make .
+cd $premake_dir
+
+# build/premake/
+
+mkdir -p tmp
+cp premake.lua tmp
+cd tmp
+
+# build/premake/tmp/
+../premake --target gnu
+
+mkdir -p $workspace_dir
+mv -f Makefile pyrogenesis.make $workspace_dir
 
 # These files need to be linked; premake makefiles assume that the
 # lua file is accessible from the makefile directory
 
-ln -f -s ../premake/premake.lua ../premake/functions.lua .
-if [ -x ../premake/premake ]; then
-	ln -f -s ../premake/premake .
+cd $workspace_dir
+ln -f -s $premake_dir/premake.lua $premake_dir/functions.lua .
+if [ -x $premake_dir/premake ]; then
+	ln -f -s $premake_dir/premake .
 fi
 
-cd ..
+cd $start_dir