diff --git a/.gitignore b/.gitignore
index 50ffec6f7..5595759f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ autom4te.cache
 awesome.doxygen
 awesome-client.1
 awesome-message.1
+awesome-menu.1
 awesome.1
 awesomerc.5
 awesomerc
diff --git a/Makefile.am b/Makefile.am
index 1dc8c6aa5..06da4a667 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -178,6 +178,7 @@ if XMLTO_MAN_WORKS
 man_MANS   += awesome.1
 man_MANS   += awesome-client.1
 man_MANS   += awesome-message.1
+man_MANS   += awesome-menu.1
 man_MANS   += awesomerc.5
 endif
 endif
@@ -186,6 +187,7 @@ endif
 EXTRA_DIST += awesome.1.txt
 EXTRA_DIST += awesome-client.1.txt
 EXTRA_DIST += awesome-message.1.txt
+EXTRA_DIST += awesome-menu.1.txt
 EXTRA_DIST += awesomerc.5.txt
 
 dist_iconslayouts_DATA += icons/layouts/dwindle.png
diff --git a/awesome-menu.1.txt b/awesome-menu.1.txt
new file mode 100644
index 000000000..ca334d71d
--- /dev/null
+++ b/awesome-menu.1.txt
@@ -0,0 +1,60 @@
+awesome-menu(1)
+=================
+
+NAME
+----
+
+awesome-menu - awesome menu system
+
+SYNOPSIS
+--------
+
+awesome-menu [-e command] <title>
+
+DESCRIPTION
+-----------
+
+awesome-menu is a tool which will pop up a menu on your screen, grabbing
+keyboard and allowing you to search through an initial completion list, or
+using your files as completion.
+
+USAGE
+-----
+By default, awesome-menu read completion from standard input. If nothing is
+read, the completion list is built from the current working directory files.
+
+To build a menu with executable program:
+
+    ls /usr/bin | awesome-menu -e 'exec ' 'Execute'
+
+To build the same menu with executable run in a terminal window:
+
+    ls /usr/bin | awesome-menu -e 'xterm -e exec ' 'Execute in terminal'
+
+To build an ssh connection prompt:
+
+    cut -d' ' -f1 ~/.ssh/known_hosts | cut -d, -f1 | awesome-menu -e 'xterm -e ssh ' 'ssh to:'
+
+If you do not specify the -e option, result will be printed to standard output.
+You can do things like that:
+
+    gzip "$(awesome-menu '"File to gzip')"
+
+OPTIONS
+-------
+-e command::
+    Command to execute. The result is appended to the end of this command (like xargs).
+<title>::
+    Print this title. This is also used to identify the menu section in the awesomerc file.
+   
+SEE ALSO
+--------
+awesome(1) awesomerc(5)
+
+AUTHORS
+-------
+Julien Danjou <julien@danjou.info>
+
+WWW
+---
+http://awesome.naquadah.org