diff --git a/build/workspaces/clean-workspaces.sh b/build/workspaces/clean-workspaces.sh
index 2edfae36a1..5555e6aa95 100755
--- a/build/workspaces/clean-workspaces.sh
+++ b/build/workspaces/clean-workspaces.sh
@@ -51,9 +51,15 @@ fi
 (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs31)
 (cd ../../libraries/source/spidermonkey && rm -rf ./mozjs24)
 
-(cd ../premake/premake5/build/gmake.bsd && ${MAKE} clean)
-(cd ../premake/premake5/build/gmake.macosx && ${MAKE} clean)
-(cd ../premake/premake5/build/gmake.unix && ${MAKE} clean)
+# Delete former premake5 gmake.* directories
+(cd ../premake/premake5/build && rm -rf ./gmake.bsd)
+(cd ../premake/premake5/build && rm -rf ./gmake.macosx)
+(cd ../premake/premake5/build && rm -rf ./gmake.unix)
+
+# Cleanup current premake directories
+(cd ../premake/premake5/build/gmake2.bsd && ${MAKE} clean)
+(cd ../premake/premake5/build/gmake2.macosx && ${MAKE} clean)
+(cd ../premake/premake5/build/gmake2.unix && ${MAKE} clean)
 
 echo "Removing generated test files..."
 
diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh
index c31e16bc77..36848e0c19 100755
--- a/build/workspaces/update-workspaces.sh
+++ b/build/workspaces/update-workspaces.sh
@@ -103,17 +103,17 @@ premake_command="premake5"
 if [ "$with_system_premake5" = "false" ]; then
   # Build bundled premake
   cd ../premake/premake5
-  PREMAKE_BUILD_DIR=build/gmake.unix
+  PREMAKE_BUILD_DIR=build/gmake2.unix
   # BSD and OS X need different Makefiles
   case "`uname -s`" in
     "GNU/kFreeBSD" )
-      # use default gmake.unix (needs -ldl as we have a GNU userland and libc)
+      # use default gmake2.unix (needs -ldl as we have a GNU userland and libc)
       ;;
     *"BSD" )
-      PREMAKE_BUILD_DIR=build/gmake.bsd
+      PREMAKE_BUILD_DIR=build/gmake2.bsd
       ;;
     "Darwin" )
-      PREMAKE_BUILD_DIR=build/gmake.macosx
+      PREMAKE_BUILD_DIR=build/gmake2.macosx
       ;;
   esac
   ${MAKE} -C $PREMAKE_BUILD_DIR ${JOBS} || die "Premake build failed"