diff --git a/oni/home/services/stumpwm.scm b/oni/home/services/stumpwm.scm
index ad66106..5f1a298 100644
--- a/oni/home/services/stumpwm.scm
+++ b/oni/home/services/stumpwm.scm
@@ -56,7 +56,6 @@
 (define (add-stumpwm-packages config)
   (append (list sbcl
                 (home-stumpwm-configuration-package config)
-                (list stumpwm "lib")
                 (home-stumpwm-configuration-stumpish-package config))))
 
 (define (home-stumpwm-extensions original-config extension-configs)
diff --git a/oni/packages/stumpwm.scm b/oni/packages/stumpwm.scm
new file mode 100644
index 0000000..15c2478
--- /dev/null
+++ b/oni/packages/stumpwm.scm
@@ -0,0 +1,35 @@
+(define-module (oni packages stumpwm)
+  #:use-module (guix packages)
+  #:use-module (guix utils)
+  #:use-module (gnu packages wm)
+  #:use-module (gnu packages lisp-xyz))
+
+(define-public stumpwm+swank
+  (package
+    (inherit stumpwm)
+    (name "stumpwm-with-swank")
+    (outputs '("out"))
+    (inputs
+     `(("stumpwm" ,stumpwm)
+       ("swank" ,sbcl-slime-swank)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments stumpwm)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'build-program
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (program (string-append out "/bin/stumpwm")))
+                 (setenv "HOME" "/tmp")
+                 (build-program program outputs
+                                #:entry-program '((stumpwm:stumpwm) 0)
+                                #:dependencies '("stumpwm" "swank")
+                                #:dependency-prefixes
+                                (map (lambda (input) (assoc-ref inputs input))
+                                     '("stumpwm" "swank")))
+                 #t)))
+           (delete 'copy-source)
+           (delete 'build)
+           (delete 'check)
+           (delete 'remove-temporary-cache)
+           (delete 'cleanup)))))))