diff --git a/.gitignore b/.gitignore
index 26ff8957..cec6e3b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 .project
 /.vagrant/
 /puphpet/files/dot/ssh/
+*.bak
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 24c0da72..d70496ea 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,11 @@ Changelog
 not yet released
 ----------------------------------
 
+
+
+v3.2.0 not yet released
+----------------------------------
+
 * #170: Implement Nexmo SMS.
 * #161: Added Swedish translation.
 * #185: Added Estonian translation.
@@ -15,6 +20,9 @@ not yet released
 * #164: Added support for FreeVoipDeal SMS gateway <http://www.freevoipdeal.com>.
 * #181: Added blank index files to prevent directory listing.
 * #237: Adding CSRF protection.
+* #287: Default language - English
+* #286: Add popular ports drop dowwn
+* #269: Added Slovenian language 
 
 v3.1.1 (released November 6, 2014)
 ----------------------------------
diff --git a/README.rst b/README.rst
index c82e1b5e..e174f5bb 100755
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@ PHP Server Monitor
    :alt: Join the chat at https://gitter.im/erickrf/nlpnet
    :target: https://gitter.im/phpservermon/phpservermon
    
-Version 3.1.1
+Version 3.2.0
 
 
 PHP Server Monitor is a script that checks whether your websites and servers are up and running.
diff --git a/docs/conf.py b/docs/conf.py
index 0be997f8..7d554a16 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = u'2008-2014, Pepijn Over'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.1'
+version = '3.2.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/src/includes/psmconfig.inc.php b/src/includes/psmconfig.inc.php
index bc620362..6b8b0b03 100644
--- a/src/includes/psmconfig.inc.php
+++ b/src/includes/psmconfig.inc.php
@@ -29,7 +29,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.1.1');
+define('PSM_VERSION', '3.2.0');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.