diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index be62c2ac6..5578d645e 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 210a80cb4..48d27e5f6 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 c5dd05e40..987bb5d54 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 c0d8a6258..236244442 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 266c30f76..f2337a2a6 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 39b6d5390..57db0d67d 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 20d735423..7f1bb3715 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 ba0da00cd..a683de922 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 318e4d593..486e419ac 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 b58432994..a28d43986 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 57616685f..0f3716c29 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 bc52c0fcf..2c361b7fc 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