diff --git a/Makefile.in b/Makefile.in
index b4588cb10..8b75e99b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,8 +261,17 @@ dialyzer/ejabberd.plt:
 	-o dialyzer/ejabberd.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
-dialyzer: dialyzer/erlang.plt dialyzer/deps.plt dialyzer/ejabberd.plt
-	@dialyzer --plts dialyzer/erlang.plt dialyzer/deps.plt dialyzer/ejabberd.plt \
+erlang_plt: dialyzer/erlang.plt
+	@dialyzer --plt dialyzer/erlang.plt --check_plt
+
+deps_plt: dialyzer/deps.plt
+	@dialyzer --plt dialyzer/deps.plt --check_plt
+
+ejabberd_plt: dialyzer/ejabberd.plt
+	@dialyzer --plt dialyzer/ejabberd.plt --check_plt
+
+dialyzer: erlang_plt deps_plt ejabberd_plt
+	@dialyzer --plts dialyzer/*.plt --no_check_plt \
 	--get_warnings -o dialyzer/error.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
@@ -273,4 +282,5 @@ test:
 	$(REBAR) skip_deps=true ct
 
 .PHONY: src doc edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
-	install uninstall uninstall-binary uninstall-all translations deps test spec
+	install uninstall uninstall-binary uninstall-all translations deps test spec \
+	erlang_plt deps_plt ejabberd_plt