diff --git a/ChangeLog b/ChangeLog
index 078f592..05f1d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-15-08  Jesse van den Kieboom  <jesse@icecrew.nl>
+
+	* data/gnoemoe.1: added manpage
+
 2006-12-08 Jesse van den Kieboom <jesse@icecrew.nl>
 	* configure.ac:
 	* COPYING
diff --git a/data/gnoemoe.1 b/data/gnoemoe.1
new file mode 100644
index 0000000..9cbb72a
--- /dev/null
+++ b/data/gnoemoe.1
@@ -0,0 +1,39 @@
+.TH "GNOEMOE" 1 "April 2006" "User Commands"
+.SH NAME
+gnoemoe \- a GNOME MOO client
+.SH SYNOPSIS
+.B gnoemoe
+[\fIOPTION ...\fR]
+.SH DESCRIPTION
+GnoeMoe is a GNOME/GTK+ MOO client.  It's stable and feature rich.  Some of
+the features include ANSI, MCP (the MOO Client Protocol), multiple tabbed
+worlds, internal editor with syntax checker, external editors, limited ruby
+scripting and triggers.  GnoeMoe aims to integrate in the GNOME desktop
+environment as well as possible.
+.SH OPTIONS
+.TP
+.B \-?, \-\-help
+Show the help message of the application and exit.
+.TP
+.B \-d, \-\-debug=DEBUGLEVEL
+Enable debugging.  Specify multiple debug levels with a comma seperated
+list.  Available levels:  default, mcp, all.
+.TP
+.B \-l, \-\-load=WORLDS
+Load specified worlds.  Specify multiple worlds with a comma separated list.
+.TP
+.B \-r, \-\-recover
+Recover from the previous session (used with GNOME session).
+.TP
+.B \-\-usage
+Display the brief ussage message of the application and exit.
+.TP
+.B \-v, \-\-version
+Show the version of the application and exit.
+.SH SEE ALSO
+The Gnoemoe website, http://wiki.icecrew.nl/software/GnoeMoe,
+and the MOO website, http://www.moo.mud.org/, for more information.
+.SH AUTHOR
+Gnoemoe was written by Jesse van den Kieboom <jesse@icecrew.nl>.
+.PP
+This manual page was written by Paul van Tilburg <paulvt@debian.org>.