diff --git a/guacd/man/guacd.8 b/guacd/man/guacd.8
index 9843ea99..7aa6146c 100644
--- a/guacd/man/guacd.8
+++ b/guacd/man/guacd.8
@@ -1,4 +1,4 @@
-.TH guacd 8 "10 Dec 2011" "version 0.5.0" "Guacamole"
+.TH guacd 8 "6 May 2012" "version 0.6.0" "Guacamole"
 .
 .SH NAME
 guacd \- Guacamole proxy daemon
@@ -8,6 +8,7 @@ guacd \- Guacamole proxy daemon
 [\fB-b\fR \fIHOST\fR]
 [\fB-l\fR \fIPORT\fR]
 [\fB-p\fR \fIFILE\fR]
+[\fB-f\fR]
 .
 .SH DESCRIPTION
 .B guacd
@@ -38,6 +39,12 @@ Causes
 to write the PID of the daemon process to the specified
 file. This is useful for init scripts and is used by the provided init
 script.
+.TP
+\fB\-f\fR
+Causes
+.B guacd
+to run in the foreground, rather than automatically forking into the
+background.
 .
 .SH AUTHOR
 Written by Michael Jumper <zhangmaike@users.sourceforge.net>
diff --git a/guacd/src/daemon.c b/guacd/src/daemon.c
index a727dc64..5435865b 100644
--- a/guacd/src/daemon.c
+++ b/guacd/src/daemon.c
@@ -227,7 +227,7 @@ int main(int argc, char* argv[]) {
             fprintf(stderr, "USAGE: %s"
                     " [-l LISTENPORT]"
                     " [-b LISTENADDRESS]"
-                    " [-p PIDFILE]",
+                    " [-p PIDFILE]"
                     " [-f]\n", argv[0]);
 
             exit(EXIT_FAILURE);