diff --git a/man/i3.man b/man/i3.man
index cf592c62..39260560 100644
--- a/man/i3.man
+++ b/man/i3.man
@@ -1,7 +1,7 @@
 i3(1)
 =====
 Michael Stapelberg <michael+i3@stapelberg.de>
-v3.beta, May 2009
+v3.gamma, August 2009
 
 == NAME
 
@@ -232,9 +232,13 @@ your login manager (xdm, slim, gdm, …) as soon as you login.
 # Disable DPMS turning off the screen
 xset dpms force on
 xset s off
+
 # Disable bell
 xset -b
 
+# Enable zapping (C-A-<Bksp> kills X)
+setxkbmap -option terminate:ctrl_alt_bksp
+
 # Enforce correct locales from the beginning
 unset LC_COLLATE
 export LC_CTYPE=de_DE.UTF-8
@@ -249,6 +253,9 @@ export LC_TELEPHONE=de_DE.UTF-8
 export LC_MEASUREMENT=de_DE.UTF-8
 export LC_IDENTIFICATION=de_DE.UTF-8
 
+# Use XToolkit in java applications
+export AWT_TOOLKIT=XToolkit
+
 # Set background color
 xsetroot -solid "#333333"