diff --git a/man/Makefile b/man/Makefile
index dec03897..1236d02d 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,4 +1,5 @@
 all:
 	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man
+	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3-msg.man
 clean:
-	rm -f i3.xml i3.1 i3.html
+	rm -f i3.xml i3.1 i3.html i3-msg.1 i3-msg.html i3-msg.xml
diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index cd411ec7..4ef16370 100644
--- a/man/asciidoc.conf
+++ b/man/asciidoc.conf
@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3</refmiscinfo>
-<refmiscinfo class="version">beta</refmiscinfo>
+<refmiscinfo class="version">gamma</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>
diff --git a/man/i3-msg.man b/man/i3-msg.man
new file mode 100644
index 00000000..c4e6d402
--- /dev/null
+++ b/man/i3-msg.man
@@ -0,0 +1,33 @@
+i3-msg(1)
+=========
+Michael Stapelberg <michael+i3@stapelberg.de>
+v3.gamma, August 2009
+
+== NAME
+
+i3-msg - send messages to i3
+
+== SYNOPSIS
+
+i3-msg "message"
+
+== DESCRIPTION
+
+i3-msg is a sample implementation for a client using the unix socket IPC
+interface to i3. At the moment, it can only be used for sending commands
+(like in configuration file for key bindings), but this may change in the
+future (staying backwards-compatible, of course).
+
+== EXAMPLE
+
+------------------------------------------------
+i3-msg "bp" # Use 1-px border for current client
+------------------------------------------------
+
+== SEE ALSO
+
+i3(1)
+
+== AUTHOR
+
+Michael Stapelberg and contributors