diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 8769704e..17fb28ae 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -5,9 +5,28 @@
 # this package in the file LICENSE.TXT.
 #
 # Further details on the project are available at http://postfixadmin.sf.net
-#
-# Last update:
-# $Id$
+
+Version 3.1 - 2017/06/25
+-------------------------------------------------
+
+  - broadcast improvements:
+    - allow to send to mailboxes only
+    - allow to send to only some domains
+    - allow domain admins to send to their domains - new config option
+      $CONF['sendmail_all_admins']
+    - don't send to inactive mailboxes or aliases
+  - update squirrelmail plugin
+  - better static DB connection cache to avoid hundreds of mysqli connection
+    when doing lots of escape_string() calls
+  - use $CONF[page_size] in viewlog.php
+  - fix problems with utf8mb4 as default charset in setup.php/upgrade.php
+  - fix default for $CONF[create_mailbox_subdirs_hostoptions]
+  - get rid of variables.inc.php (and initialize variables where needed)
+  - add favicon to fix session handling in chrome (#44)
+  - add check to ensure templates_c/ exists and is writeable
+  - recommend usage of config.local.php in setup.php
+  - remove php4 constructor from cNav_bar (page browser)
+  - update fr.lang
 
 Version 3.0.2 - 2017/02/08 - SVN r1895
 -------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 0dd5764e..8ce756be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+postfixadmin (3.1-1) unstable; urgency=low
+
+  * New upstream release
+
 postfixadmin (3.0.2-1) unstable; urgency=low
 
   * Security fix (don't delete protected aliases, CVE-2017-5930)
diff --git a/functions.inc.php b/functions.inc.php
index 73ea74fa..1662558f 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -15,8 +15,8 @@
  * Contains re-usable code.
  */
 
-$version = '3.0.2';
-$min_db_version = 1835;  # update (at least) before a release with the latest function numbrer in upgrade.php
+$version = '3.1';
+$min_db_version = 1836;  # update (at least) before a release with the latest function numbrer in upgrade.php
 
 /**
  * check_session