diff --git a/stuff/commit-policy.txt b/stuff/commit-policy.txt
deleted file mode 100644
index dd78d8d..0000000
--- a/stuff/commit-policy.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-The usual steps before commit:
-	- scripts/update_po_files.py && scripts/revert_unchanged_po_files.sh
-	- run unittests:
-		- bin/uml-setup.py
-		- log into uml
-		- install the previously build package
-		- invoke-rc.d cryptobox-server stop
-		- hostfs/bin/do_unittests.sh
-
diff --git a/stuff/upload_and_release-policy.txt b/stuff/upload_and_release-policy.txt
new file mode 100644
index 0000000..09d5d82
--- /dev/null
+++ b/stuff/upload_and_release-policy.txt
@@ -0,0 +1,22 @@
+This file describes common procedures for commiting code and for releasing a
+new version.
+
+1) day-to-day commits:
+
+The usual steps before commit:
+	- scripts/update_po_files.py && scripts/revert_unchanged_po_files.sh
+	- run unittests:
+		- bin/uml-setup.py
+		- log into uml
+		- install the previously build package
+		- invoke-rc.d cryptobox-server stop
+		- hostfs/bin/do_unittests.sh
+
+
+2) release a new version
+
+	- follow the instructions in "debian-package-policy.txt"
+	- upload the tar/deb/iso to codecoop
+	- update the website: index and download
+	- announce the release on freshmeat: http://freshmeat.net/projects/cryptobox
+