diff --git a/emacs.nix b/emacs.nix
index 4d9994923..3dad08b24 100644
--- a/emacs.nix
+++ b/emacs.nix
@@ -152,18 +152,39 @@ sly = emacsPackagesNg.melpaBuild {
   '';
 };
 
+# As the EXWM-README points out, XELB should be built from source if
+# EXWM is.
+xelb = melpaBuild {
+  pname   = "xelb";
+  ename   = "xelb";
+  version = "0.15";
+
+  packageRequires = [ cl-generic emacs ];
+
+  src = fetchFromGitHub {
+    owner  = "ch11ng";
+    repo   = "xelb";
+    rev    = "b8f168b401977098fe2b30f4ca32629c0ab6eb83";
+    sha256 = "1ack1h68x8ia0ji6wbhmayrakq35p5sgrrl6qvha3ns3pswc0pl9";
+ };
+};
+
 # EXWM pinned to a newer version than what is released due to a
 # potential fix for ch11ng/exwm#425.
-exwm = emacsPackagesNg.exwm.overrideAttrs(_: {
-  version = "master";
+exwm = melpaBuild {
+  pname   = "exwm";
+  ename   = "exwm";
+  version = "0.19";
+
+  packageRequires = [ xelb ];
 
   src = fetchFromGitHub {
     owner  = "ch11ng";
     repo   = "exwm";
-    rev    = "dd57c5eebb213c29c3b250634e316abf4917a19b";
-    sha256 = "0y2fb87pcj3rb56i8pmlz0422pl1d6prx25p707v0ihkjvhnr6y0";
+    rev    = "472f7cb82b67b98843f10c12e6bda9b8ae7262bc";
+    sha256 = "19gflsrb19aijf2xcw7j2m658qad21nbwziw38s1h2jw66vhk8dj";
  };
-});
+};
 
 in emacsWithPackages(epkgs:
   # Actual ELPA packages (the enlightened!)