diff --git a/nodewatcher/Makefile b/nodewatcher/Makefile
index d62e529017278972bd460e152435dd45039e03cc..d52aaf1e67dab76cfe5db91455a0a9197c07d855 100644
--- a/nodewatcher/Makefile
+++ b/nodewatcher/Makefile
@@ -13,9 +13,9 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://freifunk-ol.de/ffol/software/nodewatcher.git
 PKG_SOURCE:=$(PKG_NAME).tar.gz
 PKG_SOURCE_VERSION:=HEAD
-PKG_SOURCE_SUBDIR:=/
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk