diff --git a/.gitignore b/.gitignore
index 6fdb3ef..2a279bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,6 @@ doc
 config.log
 config.status
 autom4te.cache
-Makefile
-priv/Makefile
 sqlite3.plt
 .svn
 */.svn
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e158ad4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,46 @@
+ERL=/usr/local/bin/erl
+ERLC=/usr/local/bin/erlc
+ERL_ERTS=/usr/local/lib/erlang/lib/erts-5.8.1
+ERL_KERNEL=/usr/local/lib/erlang/lib/kernel-2.14.1
+ERL_STDLIB=/usr/local/lib/erlang/lib/stdlib-1.17.1
+ERL_CRYPTO=/usr/local/lib/erlang/lib/crypto-2.0.1
+ERL_COMPILER=/usr/local/lib/erlang/lib/compiler-4.7.1
+ERL_HIPE=/usr/local/lib/erlang/lib/hipe-3.7.7
+ERL_SYNTAX_TOOLS=/usr/local/lib/erlang/lib/syntax_tools-1.6.6
+OTP_TOP=/usr/lib/erlang/lib
+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
+
+test: compile_test
+	$(ERL) -noshell -pa ebin \
+		-eval 'eunit:test({dir, "ebin"})' \
+		-s init stop
+
+compile: compile_c
+	$(ERL) -make
+
+compile_test: compile_c
+	erl -noshell -eval "make:all([{d, 'TEST'}])." -s init stop
+
+compile_c:
+	test -d ebin || mkdir ebin
+	cd priv && make
+
+ifeq ($(wildcard sqlite3.plt),)
+static:
+	dialyzer --build_plt --output_plt sqlite3.plt -r $(PLT_SRC)
+	dialyzer --add_to_plt --plt sqlite3.plt -r ebin --get_warnings
+else
+static:
+	dialyzer --add_to_plt --plt sqlite3.plt -r ebin --get_warnings
+endif
+
+clean:
+	- rm -rf ebin/*.beam doc/* sqlite3.plt src/test/*.beam
+	- rm -rf ct_run* all_runs.html variables* index.html
+	- find . -name "*~" | xargs rm
+	cd priv && make clean
+
+docs:
+	$(ERL) -noshell -run edoc_run application "'sqlite3'" '"."' '[{title,"Welcome to sqlite3"},{hidden,false},{private,false}]' -s erlang halt
diff --git a/priv/Makefile b/priv/Makefile
new file mode 100644
index 0000000..c00120f
--- /dev/null
+++ b/priv/Makefile
@@ -0,0 +1,16 @@
+ERL_INTERFACE=/usr/local/lib/erlang/lib/erl_interface-3.7.1
+ERL_ROOT=/usr/local/lib/erlang
+GCC=gcc
+LDFLAGS=-shared -L/usr/lib -lsqlite3 -undefined -fPIC -lerl_interface -L$(ERL_INTERFACE)/lib -lei
+SRCS=sqlite3_drv.c sqlite3_drv.h
+OUTPUT=sqlite3_drv.so
+CFLAGS=-o ../ebin/${OUTPUT} -I$(ERL_ROOT)/usr/include/ -I$(ERL_INTERFACE)/include/ -DNULL_ATOM=null
+
+all: ../ebin/${OUTPUT}
+
+
+../ebin/${OUTPUT}: sqlite3_drv.c sqlite3_drv.h
+	${GCC} sqlite3_drv.c ${LDFLAGS} ${CFLAGS}
+
+clean:
+	rm -rf ../ebin/${OUTPUT}