diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile
index 860ecd8611e22b51abcec09f6da8b2df7dec431b..7c4d8f5cee9a499fa5fe02f1dd8bf02f2fecb2fb 100644
--- a/pkg/ccn-lite/Makefile
+++ b/pkg/ccn-lite/Makefile
@@ -1,31 +1,15 @@
 PKG_NAME=ccn-lite
 PKG_URL=https://github.com/OlegHahm/ccn-lite/
 PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
-PKG_DIR=$(CURDIR)/$(PKG_NAME)
 
-.PHONY: all clean distclean
+.PHONY: all
 
 export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
 
-all: $(PKG_DIR)/Makefile
-	"$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite.a
-	"$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite-utils.a
-	cp $(PKG_DIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a
-	cp $(PKG_DIR)/src/lib-ccn-lite-utils.a ${BINDIR}/ccn-lite-utils.a
+all: 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
+	cp $(PKG_BUILDDIR)/src/lib-ccn-lite-utils.a ${BINDIR}/ccn-lite-utils.a
 
-$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
-
-$(PKG_DIR)/.git/config:
-	test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
-
-clean::
-	@echo "Cleaning up CCN-Lite package..."
-	@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
-		git clean -x -f && \
-		git reset --hard "$(PKG_VERSION)"
-
-distclean::
-	rm -rf "$(PKG_DIR)"
-
-Makefile.include:
-	@true
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/ccn-lite/Makefile.include b/pkg/ccn-lite/Makefile.include
index 40c18ee9670f1131776c7fcc803e34a34fe3ab4f..fdf03313e7bc6f3f4e077e0f2324e2fed206d139 100644
--- a/pkg/ccn-lite/Makefile.include
+++ b/pkg/ccn-lite/Makefile.include
@@ -1,2 +1,2 @@
-INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(RIOTPKG)/ccn-lite/ccn-lite/src
+INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIR)/pkg/ccn-lite/src
 INCLUDES += -I$(RIOTBASE)/sys/posix/include