diff --git a/man/Makefile b/man/Makefile
index 1236d02d..2bf15fc5 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,6 @@
 all:
 	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man
 	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3-msg.man
+	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3-input.man
 clean:
-	rm -f i3.xml i3.1 i3.html i3-msg.1 i3-msg.html i3-msg.xml
+	rm -f i3.{1,html,xml} i3-msg.{1,html,xml} i3-input.{1,html,xml}
diff --git a/man/i3-input.man b/man/i3-input.man
new file mode 100644
index 00000000..b53406ff
--- /dev/null
+++ b/man/i3-input.man
@@ -0,0 +1,31 @@
+i3-input(1)
+=========
+Michael Stapelberg <michael+i3@stapelberg.de>
+v3.delta, November 2009
+
+== NAME
+
+i3-input - interactively take a command for i3
+
+== SYNOPSIS
+
+i3-input [-s <socket>] [-p <prefix>] [-l <limit>] [-P <prompt>] [-v]
+
+== DESCRIPTION
+
+i3-input is a tool to take commands (or parts of a command) and then send it
+to i3. This is useful for example for the mark/goto command.
+
+== EXAMPLE
+
+------------------------------------------------
+i3-input -p 'mark ' -l 1 -P 'Mark: '
+------------------------------------------------
+
+== SEE ALSO
+
+i3(1)
+
+== AUTHOR
+
+Michael Stapelberg and contributors