diff --git a/CHANGELOG.md b/CHANGELOG.md
index f58e3862..490dffb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,15 @@
 **h5ai** uses [semantic versioning](http://semver.org/).
 
 
-## develop branch
+## v0.26.0 - *2014-08-16*
 
 * removes True Type fonts
 * outsources themes to [h5ai-themes](https://github.com/lrsjng/h5ai-themes)
+* adds filesize fallback for large files and 32bit PHP
+* fixes server detection
+* adds config file tests to info page
+* removes JSON shim
+* adds caching of command checks
 * updates `jQuery.mousewheel` to 3.1.12
 * updates `jQuery.qrcode` to 0.8.0
 * replaces `markdown` with [`marked`](https://github.com/chjj/marked) 0.3.2
diff --git a/package.json b/package.json
index 429e2503..ebcfdce8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "h5ai",
-  "version": "0.25.2",
-  "develop": true,
+  "version": "0.26.0",
+  "develop": false,
   "description": "a modern HTTP web server index",
   "homepage": "http://larsjung.de/h5ai/",
   "bugs": "https://github.com/lrsjng/h5ai/issues",
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index 13060b6e..484c1b55 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -135,6 +135,7 @@ Options
     },
 
     /*
+    [DEPRECATED, will be removed]
     Adds Google Analytics asynchronous tracking code.
 
     for example: