diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index f9f655e235..fe1b80cd44 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -110,13 +110,6 @@ LC_ALL=C w3m -dump Documentation.html > Documentation.txt
 
 # Check for gettext support
 if [ -d po ] ; then
-    GETTEXT=1
-else
-    GETTEXT=0
-fi
-
-# Generate mo files
-if [ $GETTEXT -eq 1 ] ; then
     echo "* Generating mo files"
     ./scripts/generate-mo
     if [ -f ./scripts/remove-incomplete-mo ] ; then
@@ -154,7 +147,19 @@ for kit in $KITS ; do
     # Cleanup translations
     cd phpMyAdmin-$version-$kit
     scripts/lang-cleanup.sh $kit
-    rm -rf scripts
+    if [ -f examples/create_tables.sql ] ; then
+        # 3.5 and newer
+        rm -rf scripts
+    else
+        # 3.4 and older
+        # Remove javascript compiler, no need to ship it
+        rm -rf scripts/google-javascript-compiler/
+
+        # Remove scripts which are not useful for user
+        for s in compress-js create-release.sh generate-mo mergepo.py php2gettext.sh remove_control_m.sh update-po upload-release pending-po pendingpo.py ; do
+            rm -f scripts/$s
+        done
+    fi
     cd ..
 
     # Remove tar file possibly left from previous run