diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 0cabeec4dd..a14e36822e 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -17,8 +17,8 @@ set -u
 # Fail on failure
 set -e
 
-KITS="all-languages english"
-COMPRESSIONS="zip-7z tbz txz tgz 7z"
+KITS="all-languages english source"
+COMPRESSIONS="zip-7z txz tgz"
 
 # Process parameters
 
@@ -183,8 +183,6 @@ if [ -d po ] ; then
         echo "* Removing incomplete translations"
         ./scripts/remove-incomplete-mo
     fi
-    echo "* Removing gettext source files"
-    rm -rf po
 fi
 
 if [ -f ./scripts/line-counts.sh ] ; then
@@ -201,7 +199,7 @@ rm -rf .github
 rm -rf PMAStandard
 
 # Testsuite setup
-rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate
+rm -f .travis.yml .coveralls.yml .scrutinizer.yml .jshintrc .weblate codecov.yml
 
 # Remove readme for github
 rm -f README.rst
@@ -280,7 +278,25 @@ for kit in $KITS ; do
 
     # Cleanup translations
     cd phpMyAdmin-$version-$kit
-    scripts/lang-cleanup.sh $kit
+    ./scripts/lang-cleanup.sh $kit
+
+    # Remove tests, source code,...
+    if [ $kit != source ] ; then
+        echo "* Removing source files"
+        # Testsuite
+        rm -rf test/
+        rm phpunit.xml.* build.xml
+        # Gettext po files
+        rm -rf po/
+        # Documentation source code
+        mv doc/html htmldoc
+        rm -rf doc
+        mkdir doc
+        mv htmldoc doc/html
+        rm doc/html/.buildinfo doc/html/objects.inv
+        # Javascript sources
+        rm -rf js/jquery/src/ js/openlayers/src/
+    fi
 
     # Remove developer scripts
     rm -rf scripts
@@ -298,10 +314,6 @@ for kit in $KITS ; do
                     echo "* Creating $name.tar"
                     tar --owner=root --group=root --numeric-owner --sort=name -cf $name.tar $name
                 fi
-                if [ $comp = tbz ] ; then
-                    echo "* Creating $name.tar.bz2"
-                    bzip2 -9k $name.tar
-                fi
                 if [ $comp = txz ] ; then
                     echo "* Creating $name.tar.xz"
                     xz -9k $name.tar
@@ -311,18 +323,10 @@ for kit in $KITS ; do
                     gzip -9c $name.tar > $name.tar.gz
                 fi
                 ;;
-            zip)
-                echo "* Creating $name.zip"
-                zip -q -9 -r $name.zip $name
-                ;;
             zip-7z)
                 echo "* Creating $name.zip"
                 7za a -bd -tzip $name.zip $name > /dev/null
                 ;;
-            7z)
-                echo "* Creating $name.7z"
-                7za a -bd $name.7z $name > /dev/null
-                ;;
             *)
                 echo "WARNING: ignoring compression '$comp', not known!"
                 ;;
@@ -342,7 +346,7 @@ git worktree prune
 
 # Signing of files with default GPG key
 echo "* Signing files"
-for file in *.gz *.zip *.xz *.bz2 *.7z ; do
+for file in *.gz *.zip *.xz ; do
     gpg --detach-sign --armor $file
     sha1sum $file > $file.sha1
     sha256sum $file > $file.sha256
@@ -355,7 +359,7 @@ echo ""
 echo "Files:"
 echo "------"
 
-ls -la *.gz *.zip *.xz *.bz2 *.7z
+ls -la *.gz *.zip *.xz
 
 cd ..
 
diff --git a/scripts/upload-release b/scripts/upload-release
index c1588616f7..e45bad0be8 100755
--- a/scripts/upload-release
+++ b/scripts/upload-release
@@ -29,47 +29,35 @@ cat > $BATCH <<EOT
 cd /mnt/storage/files/phpMyAdmin
 mkdir $REL
 cd $REL
-put phpMyAdmin-$REL-all-languages.tar.bz2
-put phpMyAdmin-$REL-english.tar.bz2
 put phpMyAdmin-$REL-all-languages.tar.xz
 put phpMyAdmin-$REL-english.tar.xz
 put phpMyAdmin-$REL-all-languages.tar.gz
 put phpMyAdmin-$REL-english.tar.gz
 put phpMyAdmin-$REL-all-languages.zip
 put phpMyAdmin-$REL-english.zip
-put phpMyAdmin-$REL-all-languages.7z
-put phpMyAdmin-$REL-english.7z
-put phpMyAdmin-$REL-all-languages.tar.bz2.asc
-put phpMyAdmin-$REL-english.tar.bz2.asc
 put phpMyAdmin-$REL-all-languages.tar.xz.asc
 put phpMyAdmin-$REL-english.tar.xz.asc
 put phpMyAdmin-$REL-all-languages.tar.gz.asc
 put phpMyAdmin-$REL-english.tar.gz.asc
 put phpMyAdmin-$REL-all-languages.zip.asc
 put phpMyAdmin-$REL-english.zip.asc
-put phpMyAdmin-$REL-all-languages.7z.asc
-put phpMyAdmin-$REL-english.7z.asc
-put phpMyAdmin-$REL-all-languages.tar.bz2.sha256
-put phpMyAdmin-$REL-english.tar.bz2.sha256
 put phpMyAdmin-$REL-all-languages.tar.xz.sha256
 put phpMyAdmin-$REL-english.tar.xz.sha256
 put phpMyAdmin-$REL-all-languages.tar.gz.sha256
 put phpMyAdmin-$REL-english.tar.gz.sha256
 put phpMyAdmin-$REL-all-languages.zip.sha256
 put phpMyAdmin-$REL-english.zip.sha256
-put phpMyAdmin-$REL-all-languages.7z.sha256
-put phpMyAdmin-$REL-english.7z.sha256
-put phpMyAdmin-$REL-all-languages.tar.bz2.sha1
-put phpMyAdmin-$REL-english.tar.bz2.sha1
 put phpMyAdmin-$REL-all-languages.tar.xz.sha1
 put phpMyAdmin-$REL-english.tar.xz.sha1
 put phpMyAdmin-$REL-all-languages.tar.gz.sha1
 put phpMyAdmin-$REL-english.tar.gz.sha1
 put phpMyAdmin-$REL-all-languages.zip.sha1
 put phpMyAdmin-$REL-english.zip.sha1
-put phpMyAdmin-$REL-all-languages.7z.sha1
-put phpMyAdmin-$REL-english.7z.sha1
 put phpMyAdmin-$REL-notes.html
+put phpMyAdmin-$REL-source.tar.xz
+put phpMyAdmin-$REL-source.tar.xz.asc
+put phpMyAdmin-$REL-source.tar.xz.sha256
+put phpMyAdmin-$REL-source.tar.xz.sha1
 EOT
 
 # Upload to our file server