diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a50aadb4..b22a4524 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,10 +1,37 @@
+# Postfix Admin 
+# 
+# LICENSE 
+# This source file is subject to the GPL license that is bundled with  
+# this package in the file LICENSE.TXT. 
+# 
+# Further details on the project are available at : 
+#     http://www.postfixadmin.com or http://postfixadmin.sf.net 
 #
-# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
-#
-#
+# Last update:
+# $Id$
+
+
+Only in SVN trunk
+--------------------
+
+  - added support for domain aliases (from lenix)
+  - updated postfix example configuration for domain aliases and to use the new mysql map format
+  
+
+Version 2.2.1
+--------------------
+
+  - added quota parameter to mailbox_postcreation hook
+  - new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script'])
+  - fixed subfolder creation order and timing
+  - allow smtp server to be specified in vacation.pl
+  - fixed MySQL charset issues
+  - several small bugfixes
+  - Norwegian (bokmal) translation added
+  - several translation updates
+  - SVN revision 408
+
+
 Version 2.2.0
 --------------------
 
diff --git a/create-mailbox.php b/create-mailbox.php
index cb25ec43..bed9474f 100644
--- a/create-mailbox.php
+++ b/create-mailbox.php
@@ -9,9 +9,6 @@
  * Further details on the project are available at : 
  *     http://www.postfixadmin.com or http://postfixadmin.sf.net 
  * 
- * @version $Id$ 
- * @license GNU GPL v2 or later. 
- * 
  * File: create-mailbox.php
  * Responsible for allowing for the creation of mail boxes
  *
diff --git a/debian/changelog b/debian/changelog
index 91055f39..2444f2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+postfixadmin (2.2.1.1) unstable; urgency=low
+
+  * Various bug fixes (MySQL charset issue(s))
+  * Updated translations (pl, bg, ru, nb, tw etc)
+  * added quota parameter to mailbox_postcreation hook
+  * new hook to update the quota after editing a mailbox
+    ($CONF['mailbox_postedi
+t_script'])
+  * fixed subfolder creation order and timing
+  * allow smtp server to be specified in vacation.pl
+  * fixed MySQL charset issues
+  * several small bugfixes
+  * Norwegian (bokmal) translation added
+  * Subversion revision 412 (from branches/postfixadmin-2.2.1)
+  * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored)
+
+ -- David Goodwin <david.goodwin@palepurple.co.uk>  Wed, 23 Jul 2008 12:37:00 +0000
+
 postfixadmin (2.2.1) unstable; urgency=low
 
   * Various bug fixes (MySQL charset issue(s))
diff --git a/functions.inc.php b/functions.inc.php
index c6e07857..63d2a178 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -22,7 +22,7 @@ if (ereg ("functions.inc.php", $_SERVER['PHP_SELF']))
    exit;
 }
 
-$version = '2.2.0';
+$version = '2.2.1.1';
 
 /**
  * check_session