diff --git a/Makefile b/Makefile
index 715754275..4e9da13ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,19 @@
+EMACS=emacs
 
 all: install update
 
 install:
 	@cask install
 
-update:
+update: install autoloads
 	@cask update
 
-clean:
+clean: clean-extras
 	@rm -f init.elc {core,modules,private,contrib}/*.elc
+
+clean-extras:
+	@rm -rf auto-save-list recentf places ido.last async-bytecomp.log elpa projectile-bookmarks.eld projectile.cache company-statistics-cache.el tramp smex-items semanticdb
+
+autoloads:
+	@rm -rf core/autoloads.el
+	@cask exec ${EMACS} --script scripts/generate-autoloads.el