diff --git a/.build.yml b/.build.yml
index 105a54b..532d076 100644
--- a/.build.yml
+++ b/.build.yml
@@ -11,9 +11,9 @@ environment:
 tasks:
   - chezmoi-init: |
       sh -c "$(curl -fsLS get.chezmoi.io)" -- init --promptDefaults --apply https://git.sr.ht/~code-runner/dotfiles
-  # These are both broken
-  # - emacs: |
-  #     emacs --debug-init --batch -u $USER
+  - emacs: |
+      emacs --debug-init --batch -u $USER
+  # This is broken
   # - zsh: |
   #     $(chezmoi source-path)/ci/test_zsh.sh
   - mirror: |
diff --git a/.chezmoiscripts/run_onchange_after_emacs-bootstrap.sh.tmpl b/.chezmoiscripts/run_onchange_after_emacs-bootstrap.sh.tmpl
new file mode 100644
index 0000000..63d64ae
--- /dev/null
+++ b/.chezmoiscripts/run_onchange_after_emacs-bootstrap.sh.tmpl
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# This script tangles my emacs config, so that I don't need the resulting init file in source control
+
+# Ensure that this script is re run when emacs.org changes
+# emacs.org hash: {{ include "dot_emacs.d/emacs.org" | sha256sum }}
+
+emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "~/.local/share/chezmoi/dot_emacs.d/emacs.org")'