diff --git a/Makefile b/Makefile
index b5a4958fd..32dc68cd1 100644
--- a/Makefile
+++ b/Makefile
@@ -37,48 +37,9 @@ EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'ap
 
 BATCH = $(EMACS) $(EFLAGS) --batch -Q -L .
 
-ELFILES = \
-	ghc-core.el \
-	ghci-script-mode.el \
-	highlight-uses-mode.el \
-	haskell-align-imports.el \
-	haskell-cabal.el \
-	haskell-checkers.el \
-	haskell-collapse.el \
-	haskell-modules.el \
-	haskell-sandbox.el \
-	haskell-commands.el \
-	haskell-compat.el \
-	haskell-compile.el \
-	haskell-complete-module.el \
-	haskell-completions.el \
-	haskell-customize.el \
-	haskell-debug.el \
-	haskell-decl-scan.el \
-	haskell-doc.el \
-	haskell.el \
-	haskell-font-lock.el \
-	haskell-hoogle.el \
-	haskell-indentation.el \
-	haskell-indent.el \
-	haskell-interactive-mode.el \
-	haskell-lexeme.el \
-	haskell-load.el \
-	haskell-menu.el \
-	haskell-mode.el \
-	haskell-move-nested.el \
-	haskell-navigate-imports.el \
-	haskell-presentation-mode.el \
-	haskell-process.el \
-	haskell-repl.el \
-	haskell-session.el \
-	haskell-sort-imports.el \
-	haskell-string.el \
-	haskell-unicode-input-method.el \
-	haskell-utils.el \
-	inf-haskell.el
-
-ELCHECKS := $(shell echo tests/*-tests.el)
+ELFILES := $(filter-out haskell-mode-autoloads.el haskell-mode-pkg.el,$(wildcard *.el))
+
+ELCHECKS := $(wildcard tests/*-tests.el)
 
 AUTOLOADS = haskell-mode-autoloads.el
 
@@ -172,3 +133,5 @@ $(AUTOLOADS): $(ELFILES)
 		--eval '(setq make-backup-files nil)' \
 		--eval '(setq generated-autoload-file "$(CURDIR)/$@")' \
 		-f batch-update-autoloads "."
+	# check if autoloads will really load
+	$(BATCH) -l "$@"