diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index f963ee83e..962e1beed 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -274,7 +274,7 @@ case $VERSION in
 	#
 	# Beta or Release Candidate
 	#
-	SHOREWALLDIR=shorewall-${VERSION%-*}
+	SHOREWALLDIR=shorewall-common-${VERSION%-*}
 	SHOREWALLLITEDIR=shorewall-lite-${VERSION%-*}
 	TARBALL=shorewall-common-${VERSION%-*}.tgz
 	LITETARBALL=shorewall-lite-${VERSION%-*}.tgz
@@ -291,7 +291,7 @@ case $VERSION in
 	#
 	# Normal Release
 	#
-	SHOREWALLDIR=shorewall-$VERSION
+	SHOREWALLDIR=shorewall-common-$VERSION
 	SHOREWALLLITEDIR=shorewall-lite-$VERSION
 	TARBALL=shorewall-common-$VERSION.tgz
 	LITETARBALL=shorewall-lite-$VERSION.tgz