diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
new file mode 100644
index 00000000000..eb3ecb74443
--- /dev/null
+++ b/upstart-jobs/tomcat.nix
@@ -0,0 +1,21 @@
+args: with args;
+
+let
+
+cfg = config.services.tomcat;
+tomcatService = import ../services/tomcat {
+	inherit (pkgs) stdenv jdk tomcat6 su;
+	inherit (cfg) baseDir user;
+};
+
+in
+{
+	name = "tomcat";
+	job = "
+description \"Apache Tomcat server\"
+
+stop on shutdown
+
+respawn ${tomcatService}/bin/control start
+	";
+}