diff --git a/debian/floodlight.1 b/debian/floodlight.1
new file mode 100644
index 0000000000000000000000000000000000000000..80635073d7d13a860e182ac53853246ddeb9e188
--- /dev/null
+++ b/debian/floodlight.1
@@ -0,0 +1,40 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH FLOODLIGHT 1 "May 14, 2012"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+floodlight \- An Apache licensed, Java based OpenFlow controller
+.SH SYNOPSIS
+.B floodlight
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B floodlight
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBfloodlight\fP is an Apache licensed, Java based OpenFlow controller.
+.SH OPTIONS
+.TP
+.B \-cf, \-\-configFile FILE
+Floodlight configuration file.
+.SH AUTHOR
+floodlight was written by David Erickson and Big Switch Networks.
+.PP
+This manual page was written by Rich Lane <rlane@bigswitch.com>,
+for the Debian project (and may be used by others).
diff --git a/debian/floodlight.manpages b/debian/floodlight.manpages
new file mode 100644
index 0000000000000000000000000000000000000000..bec775d2741b6ae5db26abc89c80c7f41cd13f97
--- /dev/null
+++ b/debian/floodlight.manpages
@@ -0,0 +1 @@
+debian/floodlight.1
diff --git a/debian/misc/floodlight b/debian/misc/floodlight
index 590b01b4b1ad987f24a2e7d783fa95a92366f2a6..6036594a4b32028ff7de01e423e354a38bdb9b88 100755
--- a/debian/misc/floodlight
+++ b/debian/misc/floodlight
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec java -jar /usr/share/java/floodlight.jar
+exec java -jar /usr/share/java/floodlight.jar "$@"