diff --git a/Makefile b/Makefile
index 7ceefbe..19007f5 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ clean:
 	rm -rf .eunit
 	rm -f test/*.beam
 
+distclean: clean
+	rm -rf deps
 
 depends:
 	@if test ! -d ./deps; then \
@@ -25,13 +27,21 @@ etap: test/etap.beam test/util.beam
 	prove test/*.t
 
 
-eunit:
-	$(REBAR) eunit skip_deps=true
+eunit: deps/proper/ebin/proper.beam
+	ERL_FLAGS='-pa deps/proper/ebin' $(REBAR) eunit skip_deps=true
 
 
-check: build etap eunit
+deps/proper/ebin/proper.beam: deps/proper
+	cd deps/proper; $(REBAR) compile
+
+deps/proper:
+	mkdir -p deps
+	cd deps; git clone git://github.com/manopapad/proper.git
 
 
+check: build etap eunit
+
 %.beam: %.erl
 	erlc -o test/ $<
 
+.PHONY: all clean depends build etap eunit proper check
diff --git a/rebar.config b/rebar.config
index d6eb828..fe9e06a 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,3 @@
-{deps, [
-    {proper, ".*", {git, "https://github.com/manopapad/proper.git", "master"}}
-]}.
-
 {port_specs, [{"priv/jiffy.so", ["c_src/*.c"]}]}.
 
 {port_env, [