diff --git a/.versioneer-lookup b/.versioneer-lookup
index db6d9a7b7..9174f0ca6 100644
--- a/.versioneer-lookup
+++ b/.versioneer-lookup
@@ -10,10 +10,13 @@
 # master shall not use the lookup table, only tags
 master
 
-# maintenance is currently the branch for preparation of maintenance release 1.2.5
+# maintenance is currently the branch for preparation of maintenance release 1.2.6
 # so are any fix/... branches
-maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
-fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
+maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a
+fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a
+
+# Special case disconnected checkouts, e.g. 'git checkout <tag>'
+\(detached.*
 
 # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
 .* 1.3.0-dev 198d3450d94be1a2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69ef9b242..541f25515 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # OctoPrint Changelog
 
+## 1.2.6 (2015-09-02)
+
+### Improvements
+
+  * Added support for version reporting on detached checkouts
+    (see [#1041](https://github.com/foosel/OctoPrint/pull/1041))
+
+### Bug Fixes
+
+  * Pinned requirement for [psutil](https://pypi.python.org/pypi/psutil)
+    dependency to version 3.1.1 of that library due to an issue when
+    installing version 3.2.0 of that library released on 2015-09-02 through
+    a `python setup.py install` on OctoPrint. Also pinned all other requirements
+    to definitive versions that definitely work while at it to keep that from
+    happening again.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.5...1.2.6))
+
 ## 1.2.5 (2015-08-31)
 
 ### Improvements
diff --git a/setup.py b/setup.py
index 5003970e8..0fed3ef0c 100644
--- a/setup.py
+++ b/setup.py
@@ -16,23 +16,23 @@
 	"flask>=0.9,<0.11",
 	"werkzeug==0.8.3",
 	"tornado==4.0.1",
-	"sockjs-tornado>=1.0.0",
+	"sockjs-tornado==1.0.1",
 	"PyYAML==3.10",
 	"Flask-Login==0.2.2",
 	"Flask-Principal==0.3.5",
 	"Flask-Babel==0.9",
 	"Flask-Assets==0.10",
-	"pyserial",
-	"netaddr",
-	"watchdog",
-	"sarge>=0.1.4",
-	"netifaces",
-	"pylru",
-	"rsa",
-	"pkginfo",
-	"requests",
-	"semantic_version",
-	"psutil"
+	"pyserial==2.7",
+	"netaddr==0.7.17",
+	"watchdog==0.8.3",
+	"sarge==0.1.4",
+	"netifaces==0.8",
+	"pylru==1.0.9",
+	"rsa==3.2",
+	"pkginfo==1.2.1",
+	"requests==2.7.0",
+	"semantic_version==2.4.2",
+	"psutil==3.1.1"
 ]
 
 # Additional requirements for optional install options