diff --git a/system/options.nix b/system/options.nix
index 6f445514857..92d6288c597 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1376,6 +1376,10 @@ in
           default = "0.12";
           description = "Cursor speed factor for highest-speed finger motion";
         };
+	twoFingerScroll = mkOption {
+	  default = false;
+	  description = "Whether to enable two-finger drag-scrolling";
+	};
       };
 
       layout = mkOption {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 157effcb530..58e8e434ddd 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -100,6 +100,8 @@ let
         Option "TapButton1" "1"
         Option "TapButton2" "2"
         Option "TapButton3" "3"
+	Option "VertTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
+	Option "HorizTwoFingerScroll" "${if cfg.synaptics.twoFingerScroll then "1" else "0"}"
       EndSection
     '' else "";