diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 9f0b79e..19387ee 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -18,7 +18,7 @@
   #:use-module (oni packages emacs))
 
 (define-public emacs-oni-config
-  (let ((commit "3a9faa79c3ec9d40db6a07e24e2697ce7512897f")
+  (let ((commit "ecef5d97d93e589f6893cbd822ae32283e356efd")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -31,7 +31,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0r8l20h62sp2c5vsa87mnz7ksgdhxjchbrbjq6i14hv2lcjmd3fv"))))
+          (base32 "10ar2570i3bn4yz06rh48z1bhavq7gkxb9mg24lfq5zadg5na4ii"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config/")
       (synopsis "My Emacs configuration")
@@ -66,7 +66,12 @@
    (inherit emacs-oni-config)
    (name "emacs-oni-gui")
    (arguments
-    '(#:include '("oni-gui.el")))
+    '(#:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'chdir-oni-gui
+          (λ _ (chdir "oni-gui"))))
+      #:include '("\\.el$"
+                  "^icons\\/")))
    (propagated-inputs
     (list emacs-oni-ui
           emacs-oni-hydra