diff --git a/CHANGES b/CHANGES
index 5d4f7bebd4..92a54ca466 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
 Release Highlights
 ==================
 
+Version 2.1.1:
+-------------
+ * Fix invoking non-slot methods with arguments.
+ * Fix QtQuick2 preview not showing any content with Qt 5.2 or older.
+ * Fix crash when encountering tooltips in Qt5 targets.
+ * Fix deadlock in object list model.
+ * Fix QGraphicsView scene selection in in-process mode.
+ * Fix debug message handler for Qt5.
+ * A missing relocatable startup hook is no longer fatal with Qt 5.4.
+ * Fix Qt 5.4 compatibility of the QtQuick2 preview.
+
 Version 2.1.0:
 -------------
  * Aggregated property view combining static, dynamic and non-QObject property views.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98a0801c1f..194216e333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ enable_testing()
 # Version setup
 set(GAMMARAY_VERSION_MAJOR "2")
 set(GAMMARAY_VERSION_MINOR "1")
-set(GAMMARAY_VERSION_PATCH "0")
+set(GAMMARAY_VERSION_PATCH "1")
 set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
 set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
 set(GAMMARAY_SOVERSION "2.1.0")
diff --git a/debian.changelog b/debian.changelog
index 180708e9b6..6ca80cdb7b 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,80 +1,86 @@
+gammaray (2.1.1) final; urgency=low
+
+  * 2.1.1 first 2.1 bugfix release
+
+ -- Allen Winter <allen.winter@kdab.com>  Sat, 30 Aug 2014 12:00:00 -0500
+
 gammaray (2.1.0) final; urgency=low
 
   * 2.1.0 final release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 27 Jun 2014 09:30:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 27 Jun 2014 09:30:00 -0500
 
 gammaray (2.0.98) final; urgency=low
 
   * 2.1.0 rc1 release
 
- -- Allen Winter <allen.winter@kdab.com> Thu, 26 Jun 2014 15:30:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Thu, 26 Jun 2014 15:30:00 -0500
 
 gammaray (2.0.2) final; urgency=low
 
   * 2.0.2 final release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 18 Apr 2014 11:30:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 18 Apr 2014 11:30:00 -0500
 
 gammaray (2.0.1) final; urgency=low
 
   * 2.0.1 final release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 28 Feb 2014 11:30:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 28 Feb 2014 11:30:00 -0500
 
 gammaray (2.0.0) final; urgency=low
 
   * 2.0.0 final release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 17 Jan 2014 11:00:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 17 Jan 2014 11:00:00 -0500
 
 gammaray (1.9.96) final; urgency=low
 
   * 2.0.0 beta2 release
 
- -- Allen Winter <allen.winter@kdab.com> Sat, 11 Jan 2014 11:00:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Sat, 11 Jan 2014 11:00:00 -0500
 
 gammaray (1.9.95) final; urgency=low
 
   * 2.0.0 beta1 release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 20 Dec 2013 11:00:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 20 Dec 2013 11:00:00 -0500
 
 gammaray (1.3.2) final; urgency=low
 
   * 1.3.2 patch release
 
- -- Allen Winter <allen.winter@kdab.com> Thu, 03 Oct 2013 11:00:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Thu, 03 Oct 2013 11:00:00 -0500
 
 gammaray (1.3.1) final; urgency=low
 
   * 1.3.1 patch release
 
- -- Allen Winter <allen.winter@kdab.com> Tues, 30 Apr 2013 16:30:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Tues, 30 Apr 2013 16:30:00 -0500
 
 gammaray (1.3.0) final; urgency=low
 
   * 1.3.0 final release
 
- -- Allen Winter <allen.winter@kdab.com> Sun, 27 Jan 2013 18:00:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Sun, 27 Jan 2013 18:00:00 -0500
 
 gammaray (1.2.2) patch; urgency=low
 
   * 1.2.2 patch release
 
- -- Allen Winter <allen.winter@kdab.com> Fri, 21 Dec 2012 14:33:00 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Fri, 21 Dec 2012 14:33:00 -0500
 
 gammaray (1.2.1) patch; urgency=low
 
   * 1.2.1 patch release
 
- -- Allen Winter <allen.winter@kdab.com> Thu, 16 Aug 2012 10:17:14 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Thu, 16 Aug 2012 10:17:14 -0500
 
 gammaray (1.2.0) final; urgency=low
 
   * 1.2.0 final release
 
- -- Allen Winter <allen.winter@kdab.com> Thu, 05 Jul 2012 10:19:14 -0500
+ -- Allen Winter <allen.winter@kdab.com>  Thu, 05 Jul 2012 10:19:14 -0500
 
 gammaray (1.1.99) beta2; urgency=low
 
diff --git a/gammaray.dsc b/gammaray.dsc
index 46f0d3bfaa..7dc593ce4c 100644
--- a/gammaray.dsc
+++ b/gammaray.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
 Source: gammaray
-Version: 2.1.0
+Version: 2.1.1
 Binary: gammaray
 Maintainer: Allen Winter <allen.winter@kdab.com>
 Architecture: any
 Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, libqt4-dev, libqtwebkit-dev, graphviz-dev
 
 Files: 
- 00000000000000000000000000000000 00000 gammaray-2.1.0.tar.gz
+ 00000000000000000000000000000000 00000 gammaray-2.1.1.tar.gz
diff --git a/gammaray.spec b/gammaray.spec
index c37d385e66..4b81a75d32 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -1,5 +1,5 @@
 Name:           gammaray
-Version:        2.1.0
+Version:        2.1.1
 Release:        2
 Summary:        An introspection tool for Qt applications
 Source:         %{name}-%{version}.tar.gz
@@ -199,6 +199,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
 %{_libdir}/cmake/GammaRay/
 
 %changelog
+* Sat Aug 30 2014 Allen Winter <allen.winter@kdab.com> 2.1.1
+  2.1.1 final
 * Fri Jun 27 2014 Allen Winter <allen.winter@kdab.com> 2.1.0
   2.1.0 final
 * Thu Jun 26 2014 Allen Winter <allen.winter@kdab.com> 2.0.98