4 files changed, 58 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index ea565ff8..f098dbb0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po intl src plugins
+SUBDIRS = po intl src plugins man
 
 EXTRA_DIST = autogen.sh hexchat.png hexchat.desktop hexchat.ico
 
diff --git a/configure.ac b/configure.ac
index 2d5d8417..f7a449e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -966,6 +966,7 @@ plugins/fishlim/Makefile
 plugins/sysinfo/Makefile
 intl/Makefile
 po/Makefile.in
+man/Makefile
 ])
 dnl plugins/sasl/Makefile
 
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 00000000..f833cfe1
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1 @@
+man_MANS = hexchat.1
diff --git a/man/hexchat.1 b/man/hexchat.1
new file mode 100644
index 00000000..b88ba60f
--- /dev/null
+++ b/man/hexchat.1
@@ -0,0 +1,55 @@
+.TH HEXCHAT "1" "October 2012" "HexChat 2.9.3" "User Commands"
+.SH NAME
+HexChat \- manual page for HexChat 2.9.3
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+hexchat [OPTION...]
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-a\fR, \fB\-\-no\-auto\fR
+Don't auto connect to servers
+.TP
+\fB\-d\fR, \fB\-\-cfgdir\fR=\fIPATH\fR
+Use a different config directory
+.TP
+\fB\-n\fR, \fB\-\-no\-plugins\fR
+Don't auto load any plugins
+.TP
+\fB\-p\fR, \fB\-\-plugindir\fR
+Show plugin auto\-load directory
+.TP
+\fB\-u\fR, \fB\-\-configdir\fR
+Show user config directory
+.TP
+\fB\-\-url\fR=\fIURL\fR
+Open an irc://server:port/channel URL
+.TP
+\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
+Execute command:
+.TP
+\fB\-e\fR, \fB\-\-existing\fR
+Open URL or execute command in an existing HexChat
+.TP
+\fB\-\-minimize\fR=\fIlevel\fR
+Begin minimized. Level 0=Normal 1=Iconified 2=Tray
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+
+.SH AUTHOR
+This manual page was written by Davide Puricelli <evo@debian.org> for the Debian GNU/Linux system (but
+may be used by others).