diff --git a/pkg/Makefile.git b/pkg/Makefile.git
index 3a565315b453ba44c1b330ee89c9cc2df95a2eb2..417b1ae318235723b3d3498359baf98f4b91094b 100644
--- a/pkg/Makefile.git
+++ b/pkg/Makefile.git
@@ -4,7 +4,7 @@ PKG_VERSION=	# version of the package to use e.g. a git commit/ref
 
 .PHONY: all
 
-all: download
+all: git-download
 	$(MAKE) -C $(CURDIR)/$(PKG_NAME)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile
index 7c4d8f5cee9a499fa5fe02f1dd8bf02f2fecb2fb..a842f6510c72f7c98a42d6373170cc9f50219de6 100644
--- a/pkg/ccn-lite/Makefile
+++ b/pkg/ccn-lite/Makefile
@@ -6,7 +6,7 @@ PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
 
 export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
 
-all: download
+all: git-download
 	"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.a
 	"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite-utils.a
 	cp $(PKG_BUILDDIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a
diff --git a/pkg/cmsis-dsp/Makefile b/pkg/cmsis-dsp/Makefile
index 17dae9ae240b2e329e99c4b4a436932cd5aec1e3..3dcf116e5465577933725cd21c4c23a8b5996f2e 100644
--- a/pkg/cmsis-dsp/Makefile
+++ b/pkg/cmsis-dsp/Makefile
@@ -8,7 +8,7 @@ endif
 
 .PHONY: all
 
-all: download
+all: git-download
 	$(MAKE) -C $(PKG_BUILDDIR)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/libcoap/Makefile b/pkg/libcoap/Makefile
index 7a97abcd3ca7cbc6a6be1800af8c9f829836e201..29948beda3d5d6aa009dc5a8dc35dc0b0249ca57 100644
--- a/pkg/libcoap/Makefile
+++ b/pkg/libcoap/Makefile
@@ -9,7 +9,7 @@ endif
 
 .PHONY: all
 
-all: download
+all: git-download
 	"$(MAKE)" -C $(PKG_BUILDDIR)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/micro-ecc/Makefile b/pkg/micro-ecc/Makefile
index 74dd09d005d4e611e1c9b1547278d3cbb8921b03..c394db2f5a018489c29b61be7825fc42fa63e0d3 100644
--- a/pkg/micro-ecc/Makefile
+++ b/pkg/micro-ecc/Makefile
@@ -9,7 +9,7 @@ endif
 
 .PHONY: all
 
-all: download
+all: git-download
 	make -C $(PKG_BUILDDIR)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile
index e837d11f17bd8776fff6209eaefbb87a8f08d914..be2f807393dbf4cf2d82a5c4c88050b88fbfcb00 100644
--- a/pkg/microcoap/Makefile
+++ b/pkg/microcoap/Makefile
@@ -9,7 +9,7 @@ endif
 
 .PHONY: all
 
-all: download
+all: git-download
 	"$(MAKE)" -C $(PKG_BUILDDIR)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile
index 288ae29b42680714fb96808fd443adaa940c8934..5ae690db545e6840a1da1355f99f3b0fca5e1981 100644
--- a/pkg/oonf_api/Makefile
+++ b/pkg/oonf_api/Makefile
@@ -11,7 +11,7 @@ MODULE:=$(PKG_NAME)
 
 .PHONY: all
 
-all: download
+all: git-download
 	"$(MAKE)" -C $(PKG_BUILDDIR)
 	"$(MAKE)" $(BINDIR)$(MODULE).a
 
diff --git a/pkg/openwsn/Makefile b/pkg/openwsn/Makefile
index 89ef5075cd70d2ef38de5579bb1f9ebb6a810a50..beb06cc3e63040e0d72f26ffdf92ffebf84c5ed3 100644
--- a/pkg/openwsn/Makefile
+++ b/pkg/openwsn/Makefile
@@ -4,7 +4,7 @@ PKG_VERSION=ff25e5d0ae5d344ed793a724d60532fb917bf1f8
 
 .PHONY: all
 
-all: download
+all: git-download
 	"$(MAKE)" -C $(PKG_DIR)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/pkg.mk b/pkg/pkg.mk
index 5341404b61cb13815574a5fa70d1fcaff8abd741..51fa3f37107c8e0a778538ece2993306e0c067e2 100644
--- a/pkg/pkg.mk
+++ b/pkg/pkg.mk
@@ -4,15 +4,17 @@
 PKG_DIR?=$(CURDIR)
 PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME)
 
-download: $(PKG_BUILDDIR)/.downloaded
+.PHONY: git-download
 
-$(PKG_BUILDDIR)/.downloaded:
+git-download: $(PKG_BUILDDIR)/.git-downloaded
+
+$(PKG_BUILDDIR)/.git-downloaded:
 	mkdir -p $(PKG_BUILDDIR)
 	$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
 	if test -d "$(PKG_DIR)"/patches; then \
 		git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
-		fi
-	touch $(PKG_BUILDDIR)/.downloaded
+	fi
+	touch $@
 
 clean::
 	@echo "Cleaning package $(PKG_NAME)..."
diff --git a/pkg/relic/Makefile b/pkg/relic/Makefile
index 3497d89bfcb08a98f7f1d96b72b64ff9405fc032..ec2f235c6bfd5d029ac3456ef583e9954f09fd22 100644
--- a/pkg/relic/Makefile
+++ b/pkg/relic/Makefile
@@ -19,7 +19,7 @@ $(PKG_BUILDDIR)/comp-options.cmake: fix_source
 $(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake
 	cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) .
 
-fix_source: download
+fix_source: git-download
 	./fix-util_print_wo_args.sh $(PKG_BUILDDIR)
 	./fix-old-style-definitions.sh $(PKG_BUILDDIR)
 
diff --git a/pkg/wakaama/Makefile b/pkg/wakaama/Makefile
index a58e74af28a06d7f365984627376514d59f2b0a3..7f29eb345f148e4df87fdebc6b6276c013844add 100644
--- a/pkg/wakaama/Makefile
+++ b/pkg/wakaama/Makefile
@@ -7,7 +7,7 @@ PKG_VERSION=69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
 all: patch
 	"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
 
-patch: download
+patch: git-download
 	mkdir -p "$(PKG_BUILDDIR)/riotbuild"
 	cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild
 	cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_TEMP_DIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild