diff --git a/.gitignore b/.gitignore
index 4c4b72d9..ed608a24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ aclocal.m4
 autom4te.cache
 awesome.doxygen
 awesome-client.1
+awesome-message.1
 awesome.1
 awesomerc.5
 awesomerc
diff --git a/Makefile.am b/Makefile.am
index 6b1c3680..ade39e24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,6 +162,7 @@ if HAVE_ASCIIDOC
 if XMLTO_MAN_WORKS
 man_MANS   += awesome.1
 man_MANS   += awesome-client.1
+man_MANS   += awesome-message.1
 man_MANS   += awesomerc.5
 endif
 endif
@@ -169,6 +170,7 @@ endif
 
 EXTRA_DIST += awesome.1.txt
 EXTRA_DIST += awesome-client.1.txt
+EXTRA_DIST += awesome-message.1.txt
 EXTRA_DIST += awesomerc.5.txt
 
 dist_iconslayouts_DATA += icons/layouts/dwindle.png
diff --git a/awesome-message.1.txt b/awesome-message.1.txt
new file mode 100644
index 00000000..efe83404
--- /dev/null
+++ b/awesome-message.1.txt
@@ -0,0 +1,49 @@
+awesome-message(1)
+=================
+
+NAME
+----
+
+awesome-message - awesome message window
+
+SYNOPSIS
+--------
+
+awesome-message [-x xcoord] [-y ycoord] [-d delay] <message> <icon>
+
+DESCRIPTION
+-----------
+
+awesome-message is a tool which will pop up a simple X window with a message
+and optionnaly an icon in front of it.
+
+USAGE
+-----
+To have a popup when you have new mail, you can do something like that:
+
+    awesome-message "You have new mails!" ~/.awesome/icons/newmail.png
+
+OPTIONS
+-------
+-x xcoord::
+    Set x coordinate of the window.
+-y ycoord::
+    Set y coordinate of the window.
+-d delay::
+    Close the window after <delay> seconds.
+<message>::
+    Print this message in the window.
+<icon>::
+    Draw this icon file in the window.
+   
+SEE ALSO
+--------
+awesome(1)
+
+AUTHORS
+-------
+Julien Danjou <julien@danjou.info>
+
+WWW
+---
+http://awesome.naquadah.org