diff --git a/system/options.nix b/system/options.nix
index a403ca81c00..d0a26fd9937 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1035,6 +1035,23 @@
       };
     };
 
+    tomcat = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable Apache Tomcat";
+      };
+      
+      baseDir = mkOption {
+        default = "/var/tomcat";
+	description = "Location where Tomcat stores configuration files, webapplications and logfiles";
+      };
+      
+      user = mkOption {
+        default = "nobody";
+	description = "User account under which Apache Tomcat runs.";
+      };      
+    };
+
     httpd = {
 
       enable = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 5d5d24ec61f..017c1c3fda0 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -188,6 +188,12 @@ let
       inherit config pkgs;
     })  
 
+  # Apache Tomcat service
+  ++ optional config.services.tomcat.enable
+    (import ../upstart-jobs/tomcat.nix {
+      inherit config pkgs;
+    })
+
   # Samba service.
   ++ optional config.services.samba.enable
     (import ../upstart-jobs/samba.nix {