diff --git a/modules/module-list.nix b/modules/module-list.nix
index 0d342413250..3d2a11db5bb 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -73,6 +73,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/rogue.nix
+  ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
   ./services/misc/virtualbox.nix
   ./services/monitoring/monit.nix
diff --git a/modules/services/misc/svnserve.nix b/modules/services/misc/svnserve.nix
new file mode 100644
index 00000000000..c1acf5723d8
--- /dev/null
+++ b/modules/services/misc/svnserve.nix
@@ -0,0 +1,46 @@
+# SVN server
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.svnserve;
+  
+in
+
+{
+
+  ###### interface
+  
+  options = {
+  
+    services.svnserve = {
+    
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol.";
+      };
+      
+      svnBaseDir = mkOption {
+        default = "/repos";
+	description = "Base directory from which Subversion repositories are accessed.";
+      };
+    };
+    
+  };
+  
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    jobs.svnserve = {
+      startOn = "started network-interfaces";
+      stopOn = "stopping network-interfaces";
+      
+      preStart = "mkdir -p ${cfg.svnBaseDir}";
+      
+      exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
+    };
+  };
+}