diff --git a/.htaccess b/.htaccess
index fb3f5bd03d..b423b01fb2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,3 @@
-#AddHandler php53-cgi .php
-
 # Enable rewrite engine and route requests to framework
 RewriteEngine On
 #RewriteBase /selfoss
diff --git a/README.md b/README.md
index c96560d751..fdfa2db548 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ selfoss
 Copyright (c) 2013 Tobias Zeising, tobias.zeising@aditu.de  
 http://selfoss.aditu.de  
 Licensed under the GPLv3 license  
-Version 2.12-SNAPSHOT
+Version 2.12
 
 
 INSTALLATION
@@ -54,21 +54,6 @@ APPS
 Third party apps are available for iOS and Android: [Cataracta](https://itunes.apple.com/us/app/cataracta/id817392033?mt=8&ign-mpt=uo%3D4) and [Selfoss](https://play.google.com/store/apps/details?id=fr.ydelouis.selfoss).
 
 
-CHANGELOG
----------
-
-Version 2.12-SNAPSHOT
-* fix prefix bug on mysql
-* integrate fancybox for images
-* improved twitter integration
-* show authors of feeds
-* wallbag support added
-* update third party libraries
-* allow ajax based update of feeds
-* fix utf8 feed title bug
-* fix #405: extra spaces on login screen
-* fix #518: sorting of sources
-
 
 CREDITS
 -------
diff --git a/_docs/website/index.html b/_docs/website/index.html
index cb569b3909..3f2ce047cf 100644
--- a/_docs/website/index.html
+++ b/_docs/website/index.html
@@ -28,7 +28,7 @@ <h1 id="header-name"><span>selfoss</span></h1>
             <li class="documentation">documentation</li>
             <li class="about">about</li>
             <li class="forum"><a href="/forum">forum</a></li>
-            <li class="download"><a href="selfoss-2.11.zip">download</a></li>
+            <li class="download"><a href="selfoss-2.12.zip">download</a></li>
         </ul>
         
         <a id="header-fork" href="https://github.com/SSilence/selfoss"></a>
@@ -37,7 +37,7 @@ <h1 id="header-name"><span>selfoss</span></h1>
         
         <!--<div id="header-just-updated"></div>-->
         
-        <a id="header-download" href="selfoss-2.11.zip"><span>download selfoss 2.11</span></a>
+        <a id="header-download" href="selfoss-2.12.zip"><span>download selfoss 2.12</span></a>
         
         <a id="header-donate" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LR67F3T9DMSC8"><span>donate</span></a>
         
diff --git a/common.php b/common.php
index e9844c58fb..15c3463407 100644
--- a/common.php
+++ b/common.php
@@ -3,7 +3,7 @@
 $f3 = require(__DIR__.'/libs/f3/base.php');
 
 $f3->set('DEBUG',0);
-$f3->set('version','2.12-SNAPSHOT');
+$f3->set('version','2.12');
 $f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
 $f3->set('cache',__dir__.'/data/cache');
 $f3->set('BASEDIR',__dir__);
diff --git a/package.json b/package.json
index f470e90259..863322fd6a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "selfoss",
   "description": "selfoss",
-  "ver": "2.12-SNAPSHOT",
+  "ver": "2.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/SSilence/selfoss.git"