diff --git a/ThirdParty/AllClean.stage5 b/ThirdParty/AllClean.stage5
index 4b1419904..01705c7a6 100755
--- a/ThirdParty/AllClean.stage5
+++ b/ThirdParty/AllClean.stage5
@@ -50,7 +50,7 @@ echo ========================================
 echo
 
 # swak4foam
-pkg=swak4Foam-0.2.4
+pkg=swak4Foam-0.3.0
 set -x
 rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*
 set +x
@@ -62,5 +62,3 @@ echo ========================================
 echo
 
 # ----------------------------------------------------------------- end-of-file
-
-
diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5
index 5447e3aa7..2db7ef8b5 100755
--- a/ThirdParty/AllMake.stage5
+++ b/ThirdParty/AllMake.stage5
@@ -55,12 +55,12 @@ echo "Starting ThirdParty AllMake: Stage5     "
 echo "========================================"
 echo
 
-# swak4Foam - Version 0.2.4
+# swak4Foam - Version 0.3.0
 # In fact, we are basically tracking the head branch from the Mercurial repository
-# which is also replicated under the Breeder_1.7 section of the Subversion repository
+# which is also replicated under the Breeder_2.0 section of the Subversion repository
 #
 
-SWAK_RELEASE_VERSION=0.2.4
+SWAK_RELEASE_VERSION=0.3.0
 
 if [ -z "$SWAK4FOAM_SYSTEM" ]
 then
@@ -79,7 +79,7 @@ then
 		cd ./rpmBuild/BUILD;
 		hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION;
 		cd swak4Foam-$SWAK_RELEASE_VERSION;
-		hg checkout version_$SWAK_RELEASE_VERSION
+		hg checkout version_${SWAK_RELEASE_VERSION}_v2.x
 	    )
         else
 	    echo "Warning: Mercurial/hg is not installed. Switching to an alternate Subversion repository"
@@ -87,6 +87,8 @@ then
             if [ $? -eq 0 ];
 	    then
 		echo "Using Subversion/svn to download the source code for swak4Foam"
+		echo "Error: current Subversion-version does not support foam3. Please install mercurial"
+		exit -1
 		(cd ./rpmBuild/BUILD; svn checkout svn://svn.code.sf.net/p/openfoam-extend/svn/trunk/Breeder_1.7/libraries/swak4Foam swak4Foam-$SWAK_RELEASE_VERSION)
             else
 		echo "Error: Please install either a Mercurial or Subversion client in order to download the source code for swak4Foam"
@@ -98,7 +100,6 @@ then
         # comment out the next two lines
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name files   | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g")
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; find . -name options | xargs -n 1 sed -i.old "s/FOAM_USER/FOAM_SITE/g")
-	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; sed -i.old "s|// #define FOAM_SYMMTENSOR_WORKAROUND|#define FOAM_SYMMTENSOR_WORKAROUND|g" Libraries/swak4FoamParsers/include/swak.H )
 
         # We recompile everything
 	(cd ./rpmBuild/BUILD/swak4Foam-$SWAK_RELEASE_VERSION; ./Allwclean; ./Allwmake)
@@ -118,5 +119,3 @@ echo "========================================"
 echo
 
 # ----------------------------------------------------------------- end-of-file
-
-