diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index e8a7edb..6c54b9d 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -97,7 +97,8 @@
                           emacs-oni-compilation
                           emacs-oni-common-lisp
                           emacs-oni-gui
-                          emacs-oni-magit))
+                          emacs-oni-magit
+                          emacs-oni-notmuch))
   #:use-module ((oni packages hlwm-run-or-raise)
                 #:select (hlwm-run-or-raise))
   #:use-module ((oni packages inbox-size)
@@ -203,6 +204,7 @@
                  emacs-oni-common-lisp
                  emacs-oni-gui
                  emacs-oni-magit
+                 emacs-oni-notmuch
                  gforth
                  ;; Might be needed for certain icons?
                  hicolor-icon-theme
diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index d0de4bb..3e5b6f8 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -7,11 +7,13 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages bash)
+  #:use-module ((gnu packages mail)
+                #:select (emacs-notmuch))
   #:use-module (oni packages emacs)
   #:use-module (oni packages go))
 
 (define-public emacs-oni-config
-  (let ((commit "9fe6381afd2ecb14194cafd7de91bc05bc35863f")
+  (let ((commit "af7cce50e8f7800a9c431647c7d2bbad565d9ad3")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -24,7 +26,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "08ljp4d6h1d2hsckiwklz0nccj4m2rp16382hwfs1s6viqybk9s9"))))
+          (base32 "0kb6syaaxay6pvbghqjjxykwx45sqpnkyhsdy4s3wgx2hp3yxx75"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")
@@ -576,3 +578,25 @@ Emacs")))
        ("emacs-eshell-fringe-status" ,emacs-eshell-fringe-status)))
     (synopsis "My Emacs Lisp configuration")
     (description "This package provides my configuration for Emacs Lisp.")))
+
+(define-public emacs-oni-sendmail
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-sendmail")
+    (arguments
+     '(#:include '("oni-sendmail.el")))
+    (synopsis "My configuration to send email through Emacs.")
+    (description "This package provides my configuration for sending mail through Emacs.")))
+
+(define-public emacs-oni-notmuch
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-notmuch")
+    (arguments
+     '(#:include '("oni-notmuch.el")))
+    (propagated-inputs
+     (list emacs-oni-sendmail
+           emacs-notmuch
+           emacs-ol-notmuch))
+    (synopsis "My notmuch configuration for Emacs.")
+    (description "This package provides my configuration for notmuch.")))