diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 46201036f05a..364b4335dbfa 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -16,9 +16,7 @@ in
     services.xserver.windowManager.bspwm = {
       enable = mkEnableOption "bspwm";
 
-      package = mkPackageOption pkgs "bspwm" {
-        example = "bspwm-unstable";
-      };
+      package = mkPackageOption pkgs "bspwm" { };
       configFile = mkOption {
         type = with types; nullOr path;
         example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
@@ -30,9 +28,7 @@ in
       };
 
       sxhkd = {
-        package = mkPackageOption pkgs "sxhkd" {
-          example = "sxhkd-unstable";
-        };
+        package = mkPackageOption pkgs "sxhkd" { };
         configFile = mkOption {
           type = with types; nullOr path;
           example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
@@ -52,9 +48,11 @@ in
       start = ''
         export _JAVA_AWT_WM_NONREPARENTING=1
         SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
-          optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
+          optionalString (cfg.sxhkd.configFile != null) "-c ${escapeShellArg cfg.sxhkd.configFile}"
+        } &
+        ${cfg.package}/bin/bspwm ${
+          optionalString (cfg.configFile != null) "-c ${escapeShellArg cfg.configFile}"
         } &
-        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
         waitPID=$!
       '';
     };
@@ -62,9 +60,6 @@ in
   };
 
   imports = [
-    (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
-      "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
-    )
     (mkRemovedOptionModule [
       "services"
       "xserver"
diff --git a/pkgs/by-name/bs/bspwm/package.nix b/pkgs/by-name/bs/bspwm/package.nix
index 83aa6961c2ff..fd571ea760ca 100644
--- a/pkgs/by-name/bs/bspwm/package.nix
+++ b/pkgs/by-name/bs/bspwm/package.nix
@@ -7,17 +7,18 @@
   xcbutil,
   xcbutilkeysyms,
   xcbutilwm,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "bspwm";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "baskerville";
     repo = "bspwm";
     rev = version;
-    sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";
+    sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";
   };
 
   buildInputs = [
@@ -30,10 +31,17 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  passthru.tests = {
+    inherit (nixosTests) startx;
+  };
+
   meta = with lib; {
     description = "Tiling window manager based on binary space partitioning";
     homepage = "https://github.com/baskerville/bspwm";
-    maintainers = with maintainers; [ meisternu ];
+    maintainers = with maintainers; [
+      meisternu
+      ncfavier
+    ];
     license = licenses.bsd2;
     platforms = platforms.linux;
   };