diff --git a/README.org b/README.org
index 01d03e2..c4fdef9 100644
--- a/README.org
+++ b/README.org
@@ -18,7 +18,7 @@ Immutable GNU Emacs dotfiles. Built for Life, Liberty, and the Open Road.
 + 100% Literate
 + 100% Immutable
 + 100% Reproducible
-
+  
 * Init
 :PROPERTIES:
 :header-args: :tangle init.el
@@ -152,21 +152,21 @@ Configure the public GPG key that Emacs will encrypt files to.
 
 ** Startup
 
-The host configuration loads (if it exist) using the systems name.
+The host configuration tangles, and loads (if it exist) using the systems name.
 
 #+begin_src emacs-lisp
-(let ((host-file (concat dotfiles/home "/hosts/" system-name ".el")))
+(let ((host-file (concat dotfiles/home "/hosts/" system-name ".org")))
   (when (file-exists-p host-file)
-    (load-file host-file)))
+    (org-babel-load-file host-file)))
 #+end_src
 
-Load all of the enabled modules:
+Build and load all of the enabled modules.
 
 #+begin_src emacs-lisp
 (dolist (m dotfiles/modules)
-  (let ((mod-file (concat dotfiles/home "/modules/" (symbol-name m) ".el")))
+  (let ((mod-file (concat dotfiles/home "/modules/" (symbol-name m) ".org")))
     (when (file-exists-p mod-file)
-      (load-file mod-file))))
+      (org-babel-load-file mod-file))))
 #+end_src
 
 * Hosts
diff --git a/init.el b/init.el
index 0c94ad9..651cea6 100644
--- a/init.el
+++ b/init.el
@@ -123,19 +123,19 @@
 
 ;; Startup
 
-;; The host configuration loads (if it exist) using the systems name.
+;; The host configuration tangles, and loads (if it exist) using the systems name.
 
 
-(let ((host-file (concat dotfiles/home "/hosts/" system-name ".el")))
+(let ((host-file (concat dotfiles/home "/hosts/" system-name ".org")))
   (when (file-exists-p host-file)
-    (load-file host-file)))
+    (org-babel-load-file host-file)))
 
 
 
-;; Load all of the enabled modules:
+;; Build and load all of the enabled modules.
 
 
 (dolist (m dotfiles/modules)
-  (let ((mod-file (concat dotfiles/home "/modules/" (symbol-name m) ".el")))
+  (let ((mod-file (concat dotfiles/home "/modules/" (symbol-name m) ".org")))
     (when (file-exists-p mod-file)
-      (load-file mod-file))))
+      (org-babel-load-file mod-file))))