diff --git a/Makefile.am b/Makefile.am
index cbd39d2e..59b032f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ EXTRA_DIST = \
     ChangeLog.git \
     CREDITS \
     todo.org \
+    extras/upstart/fwknop.conf \
     extras/fwknop.init.debian \
     extras/fwknop.init.openwrt \
     extras/fwknop.init.redhat \
diff --git a/extras/upstart/fwknop.conf b/extras/upstart/fwknop.conf
new file mode 100644
index 00000000..04e7d410
--- /dev/null
+++ b/extras/upstart/fwknop.conf
@@ -0,0 +1,15 @@
+# fwknopd - Single Packet Authorization daemon
+#
+# The fwknopd daemon provides a Single Packet Authorization layer to services
+# such as SSHD.
+
+description	"fwknopd daemon"
+
+start on filesystem or runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+respawn limit 10 5
+umask 022
+
+exec /usr/sbin/fwknopd -f
diff --git a/todo.org b/todo.org
index 1c991b5a..411d540c 100644
--- a/todo.org
+++ b/todo.org
@@ -2,6 +2,12 @@
   This is the main todo org mode file for the fwknop project
 ** COMPLETED
    This bucket is for completed tasks.
+*** [server] For Ubuntu systems, have fwknopd managed by upstart
+    :CLOSED: <2012-09-27 Thu>
+    fwknopd can benefit from upstart management and monitoring on Ubuntu
+    systems.
+    - Added the extras/upstart/fwknop.conf file so that standard upstart
+    commands like "service fwknop start" can be issued.
 *** [server] ipfw active/expire sets cannot be the same
     :CLOSED: <2012-08-16 Thu>
     Add a check to ensure that active and expire sets are not the same value in
@@ -36,9 +42,6 @@
    page.
 ** Use assert() in various places
    Use assert() to validate expected values wherever possible.
-** [server] For Ubuntu systems, have fwknopd managed by upstart
-   fwknopd can benefit from upstart management and monitoring on Ubuntu
-   systems.
 ** [server] Include files for access.conf
    Hank Leininger suggested that the main access.conf file have an option to
    include other files in which access stanzas can be specified.  This makes