diff --git a/oni/packages/sawfish.scm b/oni/packages/sawfish.scm
new file mode 100644
index 0000000..22350c8
--- /dev/null
+++ b/oni/packages/sawfish.scm
@@ -0,0 +1,24 @@
+(define-module (oni packages sawfish)
+  #:use-module ((gnu packages sawfish)
+                #:select (sawfish))
+  #:use-module ((guix packages)
+                #:select (package))
+  #:use-module ((guix build-system emacs)
+                #:select (emacs-build-system)))
+
+(define-public emacs-sawfish
+  (package
+    (inherit sawfish)
+    (name "emacs-sawfish")
+    (build-system emacs-build-system)
+    (arguments
+     '(#:include '("sawfish.el")))
+    (synopsis "Sawfish mode")
+    (native-inputs (list))
+    (inputs (list))
+    (description "\"sawfish.el\" provides
+* A major mode for writing Sawfish code.
+  This include symbol / var / func completion and help access,
+  both from doc-string and info file.
+* sawfish-client wrapper, i.e. an interface to interact with
+  running Sawfish window manager.")))