diff --git a/.gitignore b/.gitignore
index 334e9065..d38fc510 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.cowboy_dialyzer.plt
 .eunit
 ebin
 logs
diff --git a/Makefile b/Makefile
index 76780091..04f12d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # See LICENSE for licensing information.
 
+DIALYZER = dialyzer
 REBAR = rebar
 
 all: app
@@ -20,5 +21,11 @@ eunit:
 ct:
 	@$(REBAR) ct
 
+build-plt:
+	@$(DIALYZER) --build_plt --output_plt .cowboy_dialyzer.plt \
+		--apps kernel stdlib sasl inets crypto public_key ssl
+
 dialyze:
-	@$(REBAR) dialyze
+	@$(DIALYZER) --src src --plt .cowboy_dialyzer.plt \
+		-Wbehaviours -Werror_handling \
+		-Wrace_conditions -Wunmatched_returns # -Wunderspecs
diff --git a/rebar.config b/rebar.config
index e700ab8e..afdbcc62 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,11 +1,4 @@
 {cover_enabled, true}.
-{dialyzer_opts, [src, {warnings, [
-	behaviours,
-	error_handling,
-	race_conditions,
-	unmatched_returns
-%%	underspecs
-]}]}.
 {erl_opts, [
 %%	bin_opt_info,
 	warnings_as_errors,