diff --git a/include/kernel.mk b/include/kernel.mk
index 4cf0e7a72d4..9792d04d0dd 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -43,6 +43,8 @@ else
            http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
            http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL)
 
+  PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 endif
 
 
diff --git a/include/package.mk b/include/package.mk
index e9d73e4a067..44fe33ae1fa 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -7,6 +7,9 @@
 
 all: $(if $(DUMP),dumpinfo,compile)
 
+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
diff --git a/package/alsa/Makefile b/package/alsa/Makefile
index d03ae7e5896..a96e4f0f619 100644
--- a/package/alsa/Makefile
+++ b/package/alsa/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/
 PKG_MD5SUM:=4cff99be4b225e96663fbd61cabe3182
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/alsa
diff --git a/package/aodv-uu/Makefile b/package/aodv-uu/Makefile
index ea42a7f89b4..9a3b218b6ee 100644
--- a/package/aodv-uu/Makefile
+++ b/package/aodv-uu/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://core.it.uu.se/core/files/
 PKG_MD5SUM:=05460543054449cb4b170252a7168c65
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/aodv-uu/Default
diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile
index 11c3345e947..e30b53fc22d 100644
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id:$
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=90c10702c9c3129e2ad1c01ce3975bf5
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/sangam-atm-annex-a
diff --git a/package/ar7-net/Makefile b/package/ar7-net/Makefile
index fbcdf64968d..4b7127f3f9a 100644
--- a/package/ar7-net/Makefile
+++ b/package/ar7-net/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id:$
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=ce46849a8f1055cef09c59c6bdb7f86a
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/avalanche-cpmac
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 106e7486bfe..1bf1ee0175e 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -19,8 +19,6 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/broadcom-wl/Default
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3e6cc4e9c92..fc5711f6a50 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
 PKG_MD5SUM:=5728403bce309cdabcffa414e2e64052
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 init-y :=
diff --git a/package/d80211/Makefile b/package/d80211/Makefile
index 25b9051bd65..1d8af481fd3 100644
--- a/package/d80211/Makefile
+++ b/package/d80211/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id:$
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=kmod-d80211
 PKG_VERSION:=20070201
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/d80211
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index e6af5672fa2..4451f8113ec 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_MD5SUM:=57b8643dc394cf2fbd1bced64536c6df
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dnsmasq
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 23e125e7cf0..591d7785674 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dropbear/Default
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 1543a7bc00b..47e30cb44ed 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=@SF/e2fsprogs
 PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/e2fsprogs
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 42fe78c9680..913feba5999 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=3f4f5d07d12dedc0a3fd23472171fe94
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fuse/Default
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index d4d149102df..17dbbe8b0e7 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -11,9 +11,6 @@ PKG_NAME:=gdbserver
 PKG_VERSION:=6.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 GDB_DIR:=$(TOOLCHAIN_BUILD_DIR)/gdb-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index fa916f0b1d1..90e0751825d 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=@GNU/gmp
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libgmp
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 15b64f7839a..8e534564552 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=@SF/haserl
 PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/haserl
diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile
index 4f4be05890b..aa993874882 100644
--- a/package/hostap-utils/Makefile
+++ b/package/hostap-utils/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=afe041581b8f01666e353bec20917c85
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hostap-utils
diff --git a/package/hostap/Makefile b/package/hostap/Makefile
index 15b4aecdd42..79875512f01 100644
--- a/package/hostap/Makefile
+++ b/package/hostap/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   -include $(LINUX_DIR)/.config
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index b7a7d5e1101..f362912d01e 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_BUILD_DEPENDS:=madwifi
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index 99e27762300..3d1729cb550 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
 PKG_MD5SUM:=ea2c01d027b4002e4e6b0ff266f51a51
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hotplug2
diff --git a/package/ifenslave/Makefile b/package/ifenslave/Makefile
index bf6fa239ecb..86132a10609 100644
--- a/package/ifenslave/Makefile
+++ b/package/ifenslave/Makefile
@@ -13,8 +13,6 @@ PKG_NAME:=ifenslave
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ifenslave
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 645d0349f49..5d3851f9f33 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iproute2/Default
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 67772f126c2..f1620d325cb 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=e908f3cf367e31c7902df5ab16fbe5c3
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 3b538586012..c6833433119 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=http://ipset.netfilter.org
 PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ipset
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index f29aad3f909..c7f73f1ccf0 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -21,9 +21,6 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   -include $(LINUX_DIR)/.config
diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index e149f130adb..336bdfe5a4b 100644
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -18,7 +18,6 @@ PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 0fa253c64b4..de0ad37fb7b 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://www.xmission.com/~ebiederm/files/kexec/
 PKG_MD5SUM:=b4f7ffcc294d41a6a4c40d6e44b7734d
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kexec-tools
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 5e2b3898b96..30ff8899c7c 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -7,6 +7,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=keynote
 PKG_VERSION:=2.3
@@ -17,10 +18,7 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/keynote
   SECTION:=net
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 20eb17e70a5..b2edc1aa300 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libpcap
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 7691c1149a1..a9a58a13ab5 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/
 PKG_MD5SUM:=84fef49cc39ff2605204246666f65864
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/linux-atm/Default
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index ad55d05158f..5c780ed66ca 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=bf5509fccd3852e22551826063b1b61e
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 RATE_CONTROL:=sample
diff --git a/package/nozomi/Makefile b/package/nozomi/Makefile
index 17bb8242e2c..b5ed921347b 100644
--- a/package/nozomi/Makefile
+++ b/package/nozomi/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://www.pharscape.org/3G
 PKG_MD5SUM:=90e4d8f389a18b5579f7234a23e32e99
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 PKG_UNPACK:=mkdir -p $(PKG_BUILD_DIR); $(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index 51527043ee8..7fc208556ad 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://www.ntfs-3g.org/
 PKG_MD5SUM:=873a8de662849d129fc7c475ad3f5447
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libfuse
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 9c1f6bf7f80..d0e178ef954 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \
 PKG_MD5SUM:=8ed1853538e1d05a1f5ada61ebf8bffa
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openssl/Default
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 7bb8babaffa..18ea6af9fba 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/openswan/Default
diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile
index 6aca50fd78e..e0474c48d0c 100644
--- a/package/pcmcia-cs/Makefile
+++ b/package/pcmcia-cs/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pcmcia-cs
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 8202d58d08a..4293f1d2798 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 PKG_BUILD_DEPENDS:=libpcap linux-atm
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 081ff4e52ad..eeff6686798 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE_URL:=@SF/pptpclient
 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptp
diff --git a/package/pwc/Makefile b/package/pwc/Makefile
index 3f5f60e8b5b..2540cdee3bd 100644
--- a/package/pwc/Makefile
+++ b/package/pwc/Makefile
@@ -13,7 +13,6 @@ PKG_NAME:=pwc
 PKG_VERSION:=10.0.12-rc1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.saillard.org/linux/pwc/files/
 PKG_MD5SUM:=8763f3d6fd0f9738ef9854de205a126d
diff --git a/package/rt2500/Makefile b/package/rt2500/Makefile
index c31d97ddc7d..f7631a86346 100644
--- a/package/rt2500/Makefile
+++ b/package/rt2500/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=83b8b9a091705c08d99268479f3b3b6a
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rt2500
diff --git a/package/rt2570/Makefile b/package/rt2570/Makefile
index 40e4bd77c76..ad01632f9cc 100644
--- a/package/rt2570/Makefile
+++ b/package/rt2570/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=f4131d670920a878b4d4a0f5d4d8b93a
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rt2570
diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index a8112b6985f..6b2efbe0cd1 100644
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -13,8 +13,7 @@ PKG_NAME:=rt61
 PKG_VERSION:=1.1.0-b1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/rt61-$(PKG_VERSION)/
-PKG_SOURCE:=rt61-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/rt2400
 PKG_MD5SUM:=3f2600400a3d6d878a5d27d0a2e47eed
 PKG_CAT:=zcat
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index 58914912cff..201358ca763 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=@SF/shfs
 PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/shfs/Default
diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile
index 90a29ef3863..013a77ca7f1 100644
--- a/package/spca5xx/Makefile
+++ b/package/spca5xx/Makefile
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download
 PKG_MD5SUM:=1e3fa004490a07b7b76de03d70b3e8ea
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/gspca
diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index fdd8636ef5c..43a788074e4 100644
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/strongswan/Default
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 46f302b981a..9f2e9a34a10 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -22,9 +22,6 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 PKG_MD5SUM:=320ccd2d0f4540d10e021bafa14f8985
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/udev
diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile
index cdf59fe9cfc..6b38f8e69e8 100644
--- a/package/ueagle-atm/Makefile
+++ b/package/ueagle-atm/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/
 PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/ueagle-atm
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 5fc819bcfff..05ad5cfda04 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \
 PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/util-linux/Default
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index c7b80f31d2a..d05e69f8ff9 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -19,7 +19,6 @@ PKG_CAT:=zcat
 TAR_OPTIONS += || true
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 658837c34a0..b08a4be9a75 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wpa-supplicant
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 74544bc86a6..d16c79d4fe0 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/zlib