diff --git a/system/options.nix b/system/options.nix
index d0a26fd9937..1bb75e0d5a4 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1050,6 +1050,11 @@
         default = "nobody";
 	description = "User account under which Apache Tomcat runs.";
       };      
+      
+      deployFrom = mkOption {
+        default = "";
+	description = "Location where webapplications are stored. Leave empty to use the baseDir.";
+      };
     };
 
     httpd = {
diff --git a/upstart-jobs/tomcat.nix b/upstart-jobs/tomcat.nix
index eb3ecb74443..f336acf6564 100644
--- a/upstart-jobs/tomcat.nix
+++ b/upstart-jobs/tomcat.nix
@@ -5,7 +5,7 @@ let
 cfg = config.services.tomcat;
 tomcatService = import ../services/tomcat {
 	inherit (pkgs) stdenv jdk tomcat6 su;
-	inherit (cfg) baseDir user;
+	inherit (cfg) baseDir user deployFrom;
 };
 
 in