diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index be62c2ac64080baa95244a05a53ee0c4ae93ea6c..5578d645ef51862fe1770a81213dd89bdf0eeec0 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.hauke-m.de/fileadmin/acx
 PKG_MD5SUM:=7c6c70722a5a2ad6ad25075467ea4909
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
 PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
diff --git a/package/acx/Makefile b/package/acx/Makefile
index 210a80cb48affd52df75309ecd1cc2eba44045cf..48d27e5f626dca77188af6b2edcc6079c627b4e5 100644
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -16,9 +16,9 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@openwrt/
 PKG_MD5SUM:=ec6322b9c82781897a9433ef0cefda6f
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-#PKG_CAT:=bzcat
-PKG_UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | \
+
+PKG_UNPACK:= \
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | \
 	$(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS); \
 	chmod -R u+w $(PKG_BUILD_DIR)
 
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c5dd05e40477cddd0e8f92f02bbac01ee5f28133..987bb5d54b9312e3d80bf72dc298143fbab8721e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=base-files
 PKG_RELEASE:=9
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
diff --git a/package/bcm43xx-mac80211/Makefile b/package/bcm43xx-mac80211/Makefile
index c0d8a625875e510883078f08d7198aadd45de807..236244442f55aa417c0da0a3142c62c23fa17d5f 100644
--- a/package/bcm43xx-mac80211/Makefile
+++ b/package/bcm43xx-mac80211/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=bcm43xx-mac80211
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   include $(LINUX_DIR)/.config
diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index 266c30f767b3614a6638dbcf77d7eea13bb1b70d..f2337a2a67eb5d87e49a1a31ee91d2c442603fe0 100644
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=broadcom-diag
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
diff --git a/package/broadcom-mmc/Makefile b/package/broadcom-mmc/Makefile
index 39b6d5390a1c5d3d1b646e56f9f3c209f5316578..57db0d67d7d0a97bc5579c87e13db1221e16f39f 100644
--- a/package/broadcom-mmc/Makefile
+++ b/package/broadcom-mmc/Makefile
@@ -13,8 +13,6 @@ PKG_NAME:=broadcom-mmc
 PKG_VERSION:=0.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
diff --git a/package/ifenslave/Makefile b/package/ifenslave/Makefile
index 20d735423f89dc126bf5c2cb758e40f70130d4e0..7f1bb37154b1b64489f180c474c82dadd3c1e23a 100644
--- a/package/ifenslave/Makefile
+++ b/package/ifenslave/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=ifenslave
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ifenslave
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index ba0da00cd79241ca22d660b466f8f9bff65c5cec..a683de92251c6d1a6babc6c5fb1ec611b3c5611b 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -12,13 +12,9 @@ PKG_NAME:=ncurses
 PKG_VERSION:=5.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/ncurses
 PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 318e4d593e8b035fe02c99ded443380701454c6f..486e419ac9551b26dc336c2f85770a3e1d0b70f1 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -11,8 +11,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nvram
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nvram
diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index b58432994d884323940bbfee7c22c36ddc019753..a28d439867e7c13a33604b7188b9c41ee906bb08 100644
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -13,11 +13,9 @@ PKG_NAME:=qc-usb
 PKG_VERSION:=0.6.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/qc-usb-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/qce-ga
 PKG_MD5SUM:=6f6787e1dda11ca3b936ad434154f426
-PKG_CAT:=zcat
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/switch/Makefile b/package/switch/Makefile
index 57616685fb3316cdcab24aeab3a3f8d0099b3718..0f3716c29a1e865eb71638a5d1e8e28e01aea925 100644
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=kmod-switch
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/switch
diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile
index bc52c0fcf9c91dbd54796385f819649f57252d61..2c361b7fc3861fd9f3680bf7f5e393d7c068cce6 100644
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=kmod-wlcompat
 PKG_RELEASE:=6
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/wlcompat/Default