diff --git a/ChangeLog b/ChangeLog
index ed0452c36..354977511 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-08-08  Olivier Müller  <om@omnis.ch> 
+	* new script create-release.sh
+	* moved scripts to a new subdirectory "scripts/"
+	
 2001-08-08  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_replace.php3: fixed some coding style inconcistencies and optimized a
 	  bit both the '$set$' switch cases.
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
new file mode 100755
index 000000000..cc6e0e88e
--- /dev/null
+++ b/scripts/create-release.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# $Id$ 
+#
+# 2001-08-08, swix@users.sourceforge.net:
+# - created script
+# - added release todo list
+#
+
+if [ $# != 1 ]
+then
+  echo "Usage: create-release.sh version"
+  echo "  (no spaces allowed!)"
+  echo ""
+  echo "Example: create-release.sh 2.2.0-rc5"
+  exit
+fi
+
+(mv tmp tmp-`date +%s`)
+mkdir tmp
+cd tmp
+echo "Press [ENTER]!"
+cvs -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin login
+cvs -z3 -d:pserver:anonymous@cvs.phpmyadmin.sourceforge.net:/cvsroot/phpmyadmin co phpMyAdmin
+
+date > phpMyAdmin/RELEASE-DATE-$1
+mv phpMyAdmin phpMyAdmin-$1
+zip -9 -r phpMyAdmin-$1-php3.zip phpMyAdmin-$1
+tar cvzf phpMyAdmin-$1-php3.tar.gz phpMyAdmin-$1
+cd phpMyAdmin-$1
+./extchg.sh php3 php
+cd ..
+zip -9 -r phpMyAdmin-$1-php.zip phpMyAdmin-$1
+tar cvzf phpMyAdmin-$1-php.tar.gz phpMyAdmin-$1
+
+echo ""
+echo ""
+echo ""
+echo "Files:"
+echo "------"
+
+ls -la *.gz *.zip
+cd ..
+
+cat <<END
+
+Todo now:
+---------
+1. upload the files to SF:
+        ftp upload.sourceforge.net
+        cd incoming
+        mput tmp/*.gz *.zip
+2. add files to SF files page (cut and paste changelog since last release)
+3. add SF news item to phpMyAdmin project
+4. update the download page: /home/groups/p/ph/phpmyadmin/htdocs
+5. announce release on freshmeat (http://freshmeat.net/projects/phpmyadmin/)
+6. announce release on http://phpwizard.net/phorum/list.php?f=1
+7. send a short mail (with list of major changes) to 
+        phpmyadmin-devel@lists.sourceforge.net
+        phpmyadmin-news@lists.sourceforge.net
+        phpmyadmin-users@lists.sourceforge.net
+8. increment rc count or version in CVS : in defines.inc.php3
+        the line    " define('PHPMYADMIN_VERSION', '2.2.0rc4'); "
+9. the end :-)
+
+END
+
diff --git a/extchg.sh b/scripts/extchg.sh
similarity index 100%
rename from extchg.sh
rename to scripts/extchg.sh
diff --git a/remove_control_m.sh b/scripts/remove_control_m.sh
similarity index 100%
rename from remove_control_m.sh
rename to scripts/remove_control_m.sh