diff --git a/.gitignore b/.gitignore
index ac5e820..664c49b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ config.status
 autom4te.cache
 Makefile
 priv/Makefile
-Emakefile
+sqlite3.plt
 .svn
 */.svn
 *.db
diff --git a/Makefile.in b/Makefile.in
index a519e00..38706d8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
 ERL=@ERL@
 ERLC=@ERLC@
+ERL_ERTS=@ERLANG_LIB_DIR_erts@
 ERL_KERNEL=@ERLANG_LIB_DIR_kernel@
 ERL_STDLIB=@ERLANG_LIB_DIR_stdlib@
 ERL_CRYPTO=@ERLANG_LIB_DIR_crypto@
@@ -7,7 +8,7 @@ ERL_COMPILER=@ERLANG_LIB_DIR_compiler@
 ERL_HIPE=@ERLANG_LIB_DIR_hipe@
 ERL_SYNTAX_TOOLS=@ERLANG_LIB_DIR_syntax_tools@
 OTP_TOP=/usr/lib/erlang/lib
-PLT_SRC=$(ERL_KERNEL)/ebin $(ERL_STDLIB)/ebin/ $(ERL_CRYPTO)/ebin $(ERL_COMPILER)/ebin $(ERL_HIPE)/ebin/ $(ERL_SYNTAX_TOOLS)/ebin ebin
+PLT_SRC=$(ERL_ERTS)/ebin $(ERL_KERNEL)/ebin $(ERL_STDLIB)/ebin $(ERL_CRYPTO)/ebin $(ERL_COMPILER)/ebin $(ERL_HIPE)/ebin $(ERL_SYNTAX_TOOLS)/ebin
 
 all: compile docs
 
@@ -16,8 +17,13 @@ compile:
 	$(ERL) -make
 	cd priv && make
 
+ifeq ($(wildcard sqlite3.plt),)
 static:
-	dialyzer --build_plt --output_plt sqlite3.plt -r ebin $(PLT_SRC)
+	dialyzer --build_plt --output_plt sqlite3.plt -r $(PLT_SRC) ebin
+else
+static:
+	dialyzer --add_to_plt --plt sqlite3.plt -r ebin
+endif
 
 clean:
 	- rm -rf ebin/*.beam doc/* sqlite3.plt src/test/*.beam