diff --git a/debian/changelog b/debian/changelog
index d144f061..2b52e335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,16 @@ i3-wm (4.1.3-0) unstable; urgency=low
 
  -- Michael Stapelberg <michael@stapelberg.de>  Fri, 27 Jan 2012 19:34:11 +0000
 
+i3-wm (4.1.2-3) unstable; urgency=low
+
+  * Disable generation of docs/refcard.pdf (Closes: #666363)
+  * Add debian/i3-wm.menu (Closes: #664697)
+  * Bump standards-version to 3.9.3 (no changes needed)
+  * Fix 'section' field of the i3-wm source package to 'x11'
+  * Email change: Michael Stapelberg -> stapelberg@debian.org
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Thu, 12 Apr 2012 16:09:58 +0200
+
 i3-wm (4.1.2-2) unstable; urgency=low
 
   * Rebuild against libyajl and libxcb from unstable
diff --git a/debian/control b/debian/control
index ddbe4fc3..3a4adc68 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,13 @@
 Source: i3-wm
-Section: utils
+Section: x11
 Priority: extra
-Maintainer: Michael Stapelberg <michael@stapelberg.de>
-DM-Upload-Allowed: yes
+Maintainer: Michael Stapelberg <stapelberg@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxcb-util0-dev (>= 0.3.8), libxcb-keysyms1-dev, libxcb-xinerama0-dev (>= 1.1), libxcb-randr0-dev, libxcb-icccm4-dev, libxcursor-dev, asciidoc (>= 8.4.4), xmlto, docbook-xml, pkg-config, libev-dev, flex, bison, libyajl-dev, libpcre3-dev, libstartup-notification0-dev (>= 0.10)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://i3wm.org/
 
 Package: i3
 Architecture: any
-Section: x11
 Depends: i3-wm (=${binary:Version}), ${misc:Depends}
 Recommends: i3lock (>= 2.2), suckless-tools, i3status (>= 2.3)
 Description: metapackage (i3 window manager, screen locker, menu, statusbar)
@@ -19,7 +17,6 @@ Description: metapackage (i3 window manager, screen locker, menu, statusbar)
 
 Package: i3-wm
 Architecture: any
-Section: x11
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, x11-utils
 Provides: x-window-manager
 Suggests: rxvt-unicode | x-terminal-emulator
diff --git a/debian/i3-wm.menu b/debian/i3-wm.menu
new file mode 100644
index 00000000..6c0704fb
--- /dev/null
+++ b/debian/i3-wm.menu
@@ -0,0 +1,5 @@
+?package(i3-wm): \
+	needs="wm" \
+	section="Window Managers" \
+	title="i3" \
+	command="/usr/bin/i3"