diff --git a/.gitignore b/.gitignore
index 28d1ce73ed..ae310713fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,20 +19,7 @@ rebar
 *.mo
 
 ebin/
-
-/deps/mochiweb/doc/
-/deps/mochiweb/.eunit/
-
-/deps/bert/
-/deps/dh_date/
-/deps/eiconv/
-/deps/gen_smtp/
-/deps/lager/
-/deps/mimetypes/
-/deps/mochiweb/
-/deps/ua_classifier/
-/deps/webzmachine/
-/deps/z_stdlib/
+deps/
 
 /src/erlydtl/erlydtl_parser.erl
 /src/tests/erlydtl/rendered_output/
diff --git a/GNUmakefile b/GNUmakefile
index f431be06f4..648d720d87 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,7 +22,7 @@ all: get-deps update-deps compile
 
 DEPS = $(shell find deps -type d | egrep '^deps/[^/]*$$' | grep -v 'deps/lager')
 LAGER = deps/lager
-Compile = (cd $(1) && $(REBAR_DEPS) compile)
+Compile = (cd $(1) && $(REBAR_DEPS) deps_dir=.. compile)
 
 # Helper targets
 .PHONY: erl
diff --git a/deps/bear b/deps/bear
deleted file mode 160000
index 0da736b0e9..0000000000
--- a/deps/bear
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0da736b0e9bef2c7150cd6e6c4a9fa1854deedf9
diff --git a/deps/folsom b/deps/folsom
deleted file mode 160000
index 23c96ef175..0000000000
--- a/deps/folsom
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23c96ef175bbc796a59bdfbac7ceb816579f3fab
diff --git a/deps/meck b/deps/meck
deleted file mode 160000
index 27ed56adcf..0000000000
--- a/deps/meck
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27ed56adcf39616f041d0057c8feb32067ffcb2f