2 files changed, 6 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index b4b937a..c311e76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,9 @@
 BATCH = emacs -Q --batch
 
-LOADDEFS_FNAME = km-emacs-autoloads.el
-LOADDEFS = lisp/$(LOADDEFS_FNAME)
-
+LOADDEFS = km-emacs-autoloads.el
 ELS = $(shell find lisp -maxdepth 1 \
-	-type f \( -name "*.el" -and ! -name "$(LOADDEFS_FNAME)" \) -print)
+	-type f \( -name "*.el" -and ! -name "$(LOADDEFS)" \) -print)
 
-$(LOADDEFS): $(ELS)
-	@$(BATCH) --eval "\
-	(let* ((make-backup-files nil) \
-	       (default-directory \"$(CURDIR)\") \
-	       (generated-autoload-file (expand-file-name \"$(LOADDEFS)\"))) \
-	 (update-directory-autoloads \"lisp/\"))"
+lisp/$(LOADDEFS): $(ELS)
+	cd lisp && $(BATCH) -l package --eval \
+	  '(package-generate-autoloads "km-emacs" default-directory)'
diff --git a/init.el b/init.el
index 9848cd1..cffc866 100644
--- a/init.el
+++ b/init.el
@@ -33,7 +33,7 @@
 (add-to-list 'custom-theme-load-path km/init-lisp-dir)
 
 (require 'km-util)
-(require 'km-emacs-autoloads nil t)
+(load "km-emacs-autoloads" t)
 
 (setq user-full-name "Kyle Meyer")
 (setq user-mail-address "kyle@kyleam.com")