diff --git a/modules/services/x11/window-managers/default.nix b/modules/services/x11/window-managers/default.nix
index 8adfca3cca98..de0cbd5c599e 100644
--- a/modules/services/x11/window-managers/default.nix
+++ b/modules/services/x11/window-managers/default.nix
@@ -15,6 +15,7 @@ in
     ./wmii.nix
     ./xmonad.nix
     ./i3.nix
+    ./xbmc.nix
   ];
 
   options = {
diff --git a/modules/services/x11/window-managers/xbmc.nix b/modules/services/x11/window-managers/xbmc.nix
new file mode 100644
index 000000000000..ca0e449f12b7
--- /dev/null
+++ b/modules/services/x11/window-managers/xbmc.nix
@@ -0,0 +1,31 @@
+{pkgs, config, ...}:
+
+let
+  inherit (pkgs.lib) mkOption mkIf;
+  cfg = config.services.xserver.windowManager.xbmc;
+in
+
+{
+  options = {
+    services.xserver.windowManager.xbmc = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the xbmc multimedia center.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "xbmc";
+        start = "
+          ${pkgs.xbmc}/bin/xbmc-standalone &
+          waitPID=$!
+        ";
+      }];
+    };
+    environment.systemPackages = [ pkgs.xbmc ];
+  };
+}