diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5faebfb..484290b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ZeroBin version history #
 
+  * **0.21.1 (2015-09-21)**:
+    * FIXING: lost meta data when using DB model instead of flat files
+    * FIXING: mobile navbar getting triggered on load
+    * CHANGED: database table "paste" gets automatically extended with a "meta" column
+    * CHANGED: navbar of "bootstrap" template now spans full width of view port on large screens
   * **0.21 (2015-09-19)**:
     * ADDED: Translations for German, French and Polish, language selection menu (optional)
     * ADDED: File upload and image display support (optional)
diff --git a/README.md b/README.md
index 921cd459..ab78328b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ZeroBin 0.21
+# ZeroBin 0.21.1
 
 ZeroBin is a minimalist, opensource online pastebin where the server has zero 
 knowledge of pasted data.
diff --git a/cfg/conf.ini b/cfg/conf.ini
index 56a9ca7d..cf6f9290 100644
--- a/cfg/conf.ini
+++ b/cfg/conf.ini
@@ -5,7 +5,7 @@
 ; @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
 ; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 ; @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
-; @version   0.21
+; @version   0.21.1
 
 [main]
 ; enable or disable the discussion feature, defaults to true
diff --git a/css/bootstrap/zerobin.css b/css/bootstrap/zerobin.css
index cc3ac429..cbfa93d3 100644
--- a/css/bootstrap/zerobin.css
+++ b/css/bootstrap/zerobin.css
@@ -1,4 +1,4 @@
-/* ZeroBin 0.21 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
+/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
 
 
 body {
diff --git a/css/zerobin.css b/css/zerobin.css
index f7825057..f4be0660 100644
--- a/css/zerobin.css
+++ b/css/zerobin.css
@@ -1,4 +1,4 @@
-/* ZeroBin 0.21 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
+/* ZeroBin 0.21.1 - http://sebsauvage.net/wiki/doku.php?id=php:zerobin */
 
 
 /*  CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
diff --git a/js/zerobin.js b/js/zerobin.js
index da37f329..9b2e9a2d 100644
--- a/js/zerobin.js
+++ b/js/zerobin.js
@@ -6,7 +6,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 'use strict';
@@ -267,7 +267,7 @@ $(function() {
                 return val;
             });
         },
-        
+
         /**
          * get value of cookie, if it was set, empty string otherwise
          * From: http://www.w3schools.com/js/js_cookies.asp
@@ -284,7 +284,7 @@ $(function() {
                 if (c.indexOf(name) == 0) return c.substring(name.length, c.length);
             }
             return '';
-        } 
+        }
     };
 
     /**
@@ -613,7 +613,7 @@ $(function() {
                         }
                         this.attachmentLink.attr('href', attachment);
                         this.attachment.removeClass('hidden');
-                        
+
                         // if the attachment is an image, display it
                         var imagePrefix = 'data:image/';
                         if (attachment.substring(0, imagePrefix.length) == imagePrefix)
diff --git a/lib/auto.php b/lib/auto.php
index 01b30192..b9eaf05c 100644
--- a/lib/auto.php
+++ b/lib/auto.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 spl_autoload_register('auto::loader');
diff --git a/lib/filter.php b/lib/filter.php
index 804d3753..3e2a64e2 100644
--- a/lib/filter.php
+++ b/lib/filter.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/i18n.php b/lib/i18n.php
index 795f3f4c..500a9664 100644
--- a/lib/i18n.php
+++ b/lib/i18n.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/persistence.php b/lib/persistence.php
index 197ede0c..14f5931d 100644
--- a/lib/persistence.php
+++ b/lib/persistence.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/serversalt.php b/lib/serversalt.php
index e3aeecb4..776f47c1 100644
--- a/lib/serversalt.php
+++ b/lib/serversalt.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/sjcl.php b/lib/sjcl.php
index 467959d1..a352ba9c 100644
--- a/lib/sjcl.php
+++ b/lib/sjcl.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/trafficlimiter.php b/lib/trafficlimiter.php
index cd05dfd1..07343701 100644
--- a/lib/trafficlimiter.php
+++ b/lib/trafficlimiter.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/vizhash16x16.php b/lib/vizhash16x16.php
index ca9b5eae..615ce661 100644
--- a/lib/vizhash16x16.php
+++ b/lib/vizhash16x16.php
@@ -8,7 +8,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:vizhash_gd
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.0.4 beta ZeroBin 0.21
+ * @version   0.0.4 beta ZeroBin 0.21.1
  */
 
 /**
diff --git a/lib/zerobin.php b/lib/zerobin.php
index 3f165402..ff78b723 100644
--- a/lib/zerobin.php
+++ b/lib/zerobin.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
@@ -22,7 +22,7 @@ class zerobin
      *
      * @const string
      */
-    const VERSION = '0.21';
+    const VERSION = '0.21.1';
 
     /**
      * show the same error message if the paste expired or does not exist
diff --git a/lib/zerobin/abstract.php b/lib/zerobin/abstract.php
index 23552eef..fa82eb5d 100644
--- a/lib/zerobin/abstract.php
+++ b/lib/zerobin/abstract.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/zerobin/data.php b/lib/zerobin/data.php
index 6d21a29f..cff586ca 100644
--- a/lib/zerobin/data.php
+++ b/lib/zerobin/data.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**
diff --git a/lib/zerobin/db.php b/lib/zerobin/db.php
index 3bb305df..0a636bb8 100644
--- a/lib/zerobin/db.php
+++ b/lib/zerobin/db.php
@@ -7,7 +7,7 @@
  * @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   0.21
+ * @version   0.21.1
  */
 
 /**