optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

1589 files changed, 47177 insertions, 65937 deletions

diff --git a/TODO b/TODO
index 8be6be32a..4c16d17fc 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,16 @@
+- rename radiusclient-ng -> freeradius-client
+- squid package update
+- check mips -mno-abicalls
+- check ac_cv_func_setpgrp_void=no
+- remove glib1
+- rename glib2, gdbm, lib?
+- update mt-daapd / rename
+- remove $Id$ lines
+- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e.
 - eglibc support
-- glibc 2.10 support
 - rescue initramfs image (more archs, generic kernel config )
   - replace ibm x40
   - usb boot via stick
-- kernel 2.6.29.3
+- kernel 2.6.30
 - bind isc 9.6.1
 - asterisk 1.6
-- gcc 4.4.0
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 128f3a54c..386fbbec4 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -3,7 +3,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-ifneq ($(strip ${MASTER_SITES}),)
+ifneq ($(strip ${PKG_SITES}),)
 ifeq ($(strip ${DISTFILES}),)
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
diff --git a/mk/fetch.mk b/mk/fetch.mk
index c4625ccee..dc593be0b 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -69,7 +69,7 @@ $(1):
 	fi; \
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \
-	for site in $${MASTER_SITES} $${MASTER_SITE_BACKUP}; do \
+	for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
 		: echo "$${FETCH_CMD} $$$$site$$$$filename"; \
 		rm -f "$$$$filename"; \
 		if $${FETCH_CMD} $$$$site$$$$filename; then \
diff --git a/mk/linux.mk b/mk/linux.mk
index e9d17e231..c2b226bc7 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -7,5 +7,5 @@ PKG_NAME:=	linux
 PKG_VERSION:=	$(KERNEL_VERSION)
 PKG_RELEASE:=	$(KERNEL_RELEASE)
 PKG_MD5SUM=	$(KERNEL_MD5SUM)
+PKG_SITES=  	${MASTER_SITE_KERNEL:=kernel/v2.6/}
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-MASTER_SITES=  	${MASTER_SITE_KERNEL:=kernel/v2.6/}
diff --git a/mk/package.mk b/mk/package.mk
index 03e07e2ed..b635d6a40 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -106,9 +106,11 @@ build-all-ipkgs: ${_IPKGS_COOKIE}
 # there are some parameters to the PKG_template function
 # 1.) Config.in identifier ADK_PACKAGE_$(1)
 # 2.) name of the package, for single package mostly $(PKG_NAME)
-# 3.) package version (upstream version) and package revision (adk revision),
-#     always $(PKG_VERSION)-$(PKG_REVISION)
+# 3.) package version (upstream version) and package release (adk version),
+#     always $(PKG_VERSION)-$(PKG_RELEASE)
 # 4.) dependencies to other packages, $(PKG_DEPENDS)
+# 5.) description for the package, $(PKG_DESCR)
+# 6.) section of the package, $(PKG_SECTION)  
 #    
 # should be package format independent and modular in the future
 define PKG_template
@@ -127,8 +129,11 @@ endif
 IDEPEND_$(1):=	$$(strip $(4))
 
 _ALL_CONTROLS+=	$$(IDIR_$(1))/CONTROL/control
-ICONTROL_$(1)?=	ipkg/$(2).control
+ICONTROL_$(1)?=	$(WRKDIR)/.$(2).control
 $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
+	@echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+	@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
+	@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
 	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
 	@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
 		comma=; \
@@ -146,7 +151,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 		echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
 	fi
 	@for file in conffiles preinst postinst prerm postrm; do \
-		[ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
+		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
 # FIXME: special case for device dependent base-files package
 ifneq ($(strip $${ICONTROL_ADDON_$(1)}),)
@@ -157,6 +162,13 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
 ifeq ($(ADK_DEBUG),)
 	$${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE)
 endif
+	@for file in $$$$(ls ./files/*.init 2>/dev/null); do \
+		fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \
+		check=$$$$(grep PKG $$$$file|cut -d ' '  -f 2); \
+		if [ "$$$$check" == $(2) ];then \
+			mkdir -p $$(IDIR_$(1))/etc/init.d && cp $$$$file $$(IDIR_$(1))/etc/init.d/$$$$fname; \
+		fi; \
+	done
 	@cd $${IDIR_$(1)}; for script in etc/init.d/*; do \
 		[[ -e $$$$script ]] || continue; \
 		chmod 0755 "$$$$script"; \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 1f366ab53..e1c7d2e53 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -116,7 +116,7 @@ else
 	@exit 1
 endif
 ifneq ($(filter confprog,${INSTALL_STYLE}),)
-	for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
+	@for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
 		[[ -e $$a ]] || continue; \
 		$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
 	done
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index 039c790ee..993b9b164 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -9,12 +9,15 @@ PKG_NAME:=		6tunnel
 PKG_VERSION:=		0.11rc1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
-MASTER_SITES:=		http://toxygen.net/6tunnel/
+PKG_DESCR:=		IPv4/IPv6 tunnel proxy
+PKG_SECTION:=		net
+PKG_SITES:=		http://toxygen.net/6tunnel/
+
 WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \
diff --git a/package/6tunnel/ipkg/6tunnel.control b/package/6tunnel/ipkg/6tunnel.control
deleted file mode 100644
index ea4978572..000000000
--- a/package/6tunnel/ipkg/6tunnel.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: 6tunnel
-Priority: optional
-Section: net
-Description: An IPv4/IPv6 tunnel proxy
diff --git a/package/Config.in b/package/Config.in
index 25badd5d0..d2d291b06 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -206,7 +206,8 @@ menu "IPv6"
 depends ADK_IPV6
 source "package/6tunnel/Config.in"
 source "package/aiccu/Config.in"
-source "package/dhcp6/Config.in"
+# timeb.h / dn_comp issues
+#source "package/dhcpv6/Config.in"
 source "package/miredo/Config.in"
 source "package/mrd6/Config.in"
 source "package/ndisc/Config.in"
@@ -231,7 +232,6 @@ source "package/ether-wake/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
-source "package/iptables-snmp/Config.in"
 source "package/knock/Config.in"
 source "package/linux-atm/Config.in"
 source "package/macchanger/Config.in"
@@ -339,7 +339,6 @@ source "package/chillispot/Config.in"
 source "package/hostapd/Config.in"
 source "package/iw/Config.in"
 #source "package/kismet/Config.in"
-source "package/nocatsplash/Config.in"
 source "package/olsrd/Config.in"
 source "package/snort-wireless/Config.in"
 source "package/wifidog/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 6d30f7320..d361acb20 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -36,7 +36,7 @@ endif
 davfs2-compile: libiconv-compile neon-compile
 dbus-compile: expat-compile
 deco-compile: ncurses-compile
-dhcp6-compile: ncurses-compile
+dhcpv6-compile: libnl-compile ncurses-compile
 digitemp-compile: libusb-compile
 dsniff-compile: libnids-compile openssl-compile libgdbm-compile
 elinks-compile: openssl-compile
@@ -76,7 +76,6 @@ ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y)
 iperf-compile: uclibc++-compile
 endif
 ipsec-tools-compile: openssl-compile
-iptables-snmp-compile: net-snmp-compile
 iptraf-compile: ncurses-compile
 irssi-compile: glib2-compile ncurses-compile
 iw-compile: libnl-compile
@@ -151,7 +150,6 @@ ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y)
 nmap-compile: uclibc++-compile
 endif
 nmap-compile: pcre-compile libpcap-compile
-nocatsplash-compile: glib-compile
 obexftp-compile: openobex-compile libiconv-compile
 opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile
 openct-compile: libtool-compile libusb-compile
diff --git a/package/Makefile b/package/Makefile
index 512b6ebb5..f44626806 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -66,7 +66,7 @@ package-$(ADK_PACKAGE_DECO) += deco
 package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper
 package-$(ADK_COMPILE_DHCP) += dhcp
 package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(ADK_PACKAGE_DHCP6) += dhcp6
+package-$(ADK_COMPILE_DHCPV6) += dhcpv6
 package-$(ADK_PACKAGE_DIGITEMP) += digitemp
 package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq
 package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools
@@ -140,7 +140,6 @@ package-$(ADK_COMPILE_IPROUTE2) += iproute2
 package-$(ADK_PACKAGE_IPSEC_TOOLS) += ipsec-tools
 package-$(ADK_PACKAGE_IPSET) += ipset
 package-$(ADK_COMPILE_IPTABLES) += iptables
-package-$(ADK_PACKAGE_IPTABLES_SNMP) += iptables-snmp
 package-$(ADK_PACKAGE_IPTRAF) += iptraf
 package-$(ADK_PACKAGE_IRSSI) += irssi
 package-$(ADK_PACKAGE_IW) += iw
@@ -259,7 +258,6 @@ package-$(ADK_PACKAGE_NETSTAT_NAT) += netstat-nat
 package-$(ADK_PACKAGE_NFS_UTILS) += nfs-utils
 package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils
 package-$(ADK_PACKAGE_NMAP) += nmap
-package-$(ADK_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient
 package-$(ADK_PACKAGE_OBEXFTP) += obexftp
 package-$(ADK_PACKAGE_OLSRD) += olsrd
@@ -346,7 +344,6 @@ package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel
 package-$(ADK_PACKAGE_SSMTP) += ssmtp
 package-$(ADK_PACKAGE_STRACE) += strace
 package-$(ADK_PACKAGE_STRESS) += stress
-package-$(ADK_PACKAGE_STRONGSWAN) += strongswan
 package-$(ADK_PACKAGE_SUBVERSION) += subversion
 package-$(ADK_PACKAGE_SWCONFIG) += swconfig
 package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng
@@ -412,7 +409,7 @@ package-$(ADK_PACKAGE_ZSH) += zsh
 # kernel addon packages
 package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx
 package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211
-package-$(ADK_PACKAGE_KMOD_FS_NTFS_3G) += ntfs-3g
+package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g
 
 DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 1f5d6b510..36a3900d3 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -9,15 +9,18 @@ PKG_NAME:=		aiccu
 PKG_VERSION:=		20070115
 PKG_RELEASE:=		7
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
+PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-ipv6 libpthread
+PKG_URL:=		http://www.sixxs.net
+PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 
-MASTER_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
-
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
 		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
diff --git a/package/aiccu/ipkg/aiccu.conffiles b/package/aiccu/files/aiccu.conffiles
index 79c42f998..79c42f998 100644
--- a/package/aiccu/ipkg/aiccu.conffiles
+++ b/package/aiccu/files/aiccu.conffiles
diff --git a/package/aiccu/files/aiccu.init b/package/aiccu/files/aiccu.init
index e678664bf..dbec044a4 100644
--- a/package/aiccu/files/aiccu.init
+++ b/package/aiccu/files/aiccu.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG aiccu
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/aiccu/ipkg/aiccu.postinst b/package/aiccu/files/aiccu.postinst
index e6d0f0d9a..e6d0f0d9a 100644
--- a/package/aiccu/ipkg/aiccu.postinst
+++ b/package/aiccu/files/aiccu.postinst
diff --git a/package/aiccu/ipkg/aiccu.control b/package/aiccu/ipkg/aiccu.control
deleted file mode 100644
index 98bc6f1ba..000000000
--- a/package/aiccu/ipkg/aiccu.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: aiccu
-Priority: optional
-Section: net
-Depends: kmod-ipv6, libpthread
-Description: SixXS Automatic IPv6 Connectivity Client Utility
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index 1e6a3c3b7..3d53df6a4 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		aircrack-ng
 PKG_VERSION:=		1.0-rc3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		37884de939af82eab60d3e7d165b40ad
-MASTER_SITES:=		http://download.aircrack-ng.org/
+PKG_DESCR:=		set of tools for auditing wireless networks
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpthread libopenssl libpcap
+PKG_URL:=		http://www.aircrack-ng.org
+PKG_SITES:=		http://download.aircrack-ng.org/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=	auto
 INSTALL_STYLE=	auto
diff --git a/package/aircrack-ng/ipkg/aircrack-ng.control b/package/aircrack-ng/ipkg/aircrack-ng.control
deleted file mode 100644
index 4e0ed40e7..000000000
--- a/package/aircrack-ng/ipkg/aircrack-ng.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: aircrack-ng
-Priority: optional
-Section: net
-Depends: libpthread, libopenssl, libpcap
-Description: A set of tools for auditing wireless networks
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index e57470e40..4c82c6419 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.19
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		73db3666c211e5fb023bb77450cf430d
-MASTER_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
+PKG_DESCR:=		ALSA sound library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.alsa-project.org
+PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
 			ftp://ftp.alsa-project.org/pub/lib/
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-python
@@ -23,8 +27,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto confprog
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib
-	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa
+	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
 	${CP} ${WRKINST}/usr/lib/libasound.so.* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 
diff --git a/package/alsa-lib/ipkg/alsa-lib.postinst b/package/alsa-lib/files/alsa-lib.postinst
index 848959231..848959231 100644
--- a/package/alsa-lib/ipkg/alsa-lib.postinst
+++ b/package/alsa-lib/files/alsa-lib.postinst
diff --git a/package/alsa-lib/ipkg/alsa-lib.control b/package/alsa-lib/ipkg/alsa-lib.control
deleted file mode 100644
index 480bb0dae..000000000
--- a/package/alsa-lib/ipkg/alsa-lib.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: alsa-lib
-Priority: optional
-Section: libs
-Description: ALSA sound library
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 94719705f..5434bc399 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.19
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5ff0379c707c1a29083233edc9ab4e06
-MASTER_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
+PKG_DESCR:=		ALSA mixer utility
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.alsa-project.org
+PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
 			ftp://ftp.alsa-project.org/pub/utils/
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
@@ -23,9 +27,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/etc/init.d
-	${INSTALL_BIN} ./files/amixer.init ${IDIR_ALSA_UTILS}/etc/init.d/amixer
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
+	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 
 	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-utils/ipkg/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index f18dbf62a..f18dbf62a 100644
--- a/package/alsa-utils/ipkg/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index 5d5aa6e2b..d7f388892 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG alsa-utils
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/alsa-utils/ipkg/alsa-utils.control b/package/alsa-utils/ipkg/alsa-utils.control
deleted file mode 100644
index 88e38c96c..000000000
--- a/package/alsa-utils/ipkg/alsa-utils.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: alsa-utils
-Priority: optional
-Section: libs
-Description: ALSA utilities
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 8a3de3b82..2404632e8 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=              apr-util
 PKG_VERSION:=           0.9.15
 PKG_RELEASE:=           1
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
-MASTER_SITES:=		http://apache.mirror.clusters.cc/apr/
+PKG_DESCR:=		Apache Portable Runtime utility library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libexpat apr
+PKG_URL:=		http://apr.apache.org
+PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=       gnu
 CONFIGURE_ARGS+=	--without-berkeley-db
diff --git a/package/apr-util/ipkg/apr-util.control b/package/apr-util/ipkg/apr-util.control
deleted file mode 100644
index 45af346d3..000000000
--- a/package/apr-util/ipkg/apr-util.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: apr-util
-Priority: optional
-Section: lib
-Description: Apache Portable Runtime
-Depends: libexpat, apr
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 8dbddd98b..bfe4f5b8f 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -9,11 +9,18 @@ PKG_NAME:=		apr
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
-MASTER_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
+PKG_DESCR:=		Apache Portable Runtime library
+PKG_SECTION:=		libs
+PKG_URL:=		http://apr.apache.org
+PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_PACKAGE_APR_THREADING},y)
+PKG_DEPENDS:=		libpthread
+endif
+
+$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
@@ -35,20 +42,13 @@ INSTALL_STYLE:=		auto
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/
-
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build
 	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
-
 	# we need to patch paths to get apr-util compiling
-	printf '%s\n%s\n%s\n%s\n%s\nwq\n' \
-	    '/^installbuilddir="/s##&${STAGING_DIR}/#' \
-	    '/^libdir="/s##&${STAGING_DIR}/#' \
-	    '/^datadir="/s##&${STAGING_DIR}/#' \
-	    '/^includedir="/s##&${STAGING_DIR}/#' \
-	    '/^bindir="/s##&${STAGING_DIR}/#' | \
-	    ed -s ${WRKINST}/usr/bin/apr-config
-ifeq (${ADK_PACKAGE_APR_THREADING},y)
-	echo 'Depends: libpthread' >> ${IDIR_APR}/CONTROL/control
-endif
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr/ipkg/apr.control b/package/apr/ipkg/apr.control
deleted file mode 100644
index 8ea0e5e73..000000000
--- a/package/apr/ipkg/apr.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: apr
-Priority: optional
-Section: lib
-Description: Apache Portable Runtime
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index ecf7118af..50c924341 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
-MASTER_SITES:=		http://niels.xtdnet.nl/honeyd/
+PKG_DESCR:=		Generates ARP responses for IP address ranges
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap libdnet libevent
+PKG_URL:=		http://niels.xtdnet.nl/honeyd/
+PKG_SITES:=		http://niels.xtdnet.nl/honeyd/
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libdnet=${STAGING_DIR}/usr \
diff --git a/package/arpd/ipkg/arpd.control b/package/arpd/ipkg/arpd.control
deleted file mode 100644
index 249263e12..000000000
--- a/package/arpd/ipkg/arpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: arpd
-Priority: optional
-Section: net
-Depends: libpcap, libdnet, libevent
-Description: Generates ARP responses for IP address ranges
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index 95197101b..2c2c51cb0 100644
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		arpwatch
 PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
-MASTER_SITES:=		ftp://ftp.ee.lbl.gov/
+PKG_DESCR:=		Ethernet monitor program for keeping track of ethernet/ip address pairings
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap
+PKG_URL:=		http://www-nrg.ee.lbl.gov
+PKG_SITES:=		ftp://ftp.ee.lbl.gov/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
@@ -23,8 +27,7 @@ MAKE_FLAGS+=		ARPDIR=/etc/arpwatch \
 			LIBS="-L$(STAGING_DIR)/usr/lib -lpcap"
 
 do-install:
-	$(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_ARPWATCH)/etc/arpwatch
+	$(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin $(IDIR_ARPWATCH)/etc/arpwatch
 	$(INSTALL_BIN) $(WRKBUILD)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/
 	$(INSTALL_BIN) $(WRKBUILD)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/
 	$(INSTALL_DATA) $(WRKBUILD)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/
diff --git a/package/arpwatch/ipkg/arpwatch.conffiles b/package/arpwatch/files/arpwatch.conffiles
index 9b9d8b3f6..9b9d8b3f6 100644
--- a/package/arpwatch/ipkg/arpwatch.conffiles
+++ b/package/arpwatch/files/arpwatch.conffiles
diff --git a/package/arpwatch/ipkg/arpwatch.control b/package/arpwatch/ipkg/arpwatch.control
deleted file mode 100644
index a72088153..000000000
--- a/package/arpwatch/ipkg/arpwatch.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: arpwatch
-Priority: optional
-Section: net
-Description: Ethernet monitor program for keeping track of ethernet/ip address pairings
-Depends: libpcap
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index dcda8b77a..f4b0b9f23 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -9,21 +9,25 @@ PKG_NAME:=		asterisk
 PKG_VERSION:=		1.4.24.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b74744350f420b3a94d5323c489426f
-MASTER_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
+PKG_DESCR:=		Open Source PBX
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libncurses libpthread
+PKG_URL:=		http://www.asterisk.org
+PKG_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
@@ -166,8 +170,6 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
-	${INSTALL_DIR} $(IDIR_ASTERISK)/etc/init.d
-	${INSTALL_BIN}  ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/asterisk
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
@@ -187,7 +189,7 @@ asterisk-voicemail-install:
 	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
 	${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
 	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-	install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
+	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
 	$(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
 
 asterisk-chan-mgcp-install:
@@ -211,7 +213,7 @@ asterisk-chan-iax2-install:
 
 asterisk-codec-speex-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
-	install -m0755 $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
 
 asterisk-codec-gsm-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
diff --git a/package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles b/package/asterisk/files/asterisk-chan-bluetooth.conffiles
index 40a085235..40a085235 100644
--- a/package/asterisk/ipkg/asterisk-chan-bluetooth.conffiles
+++ b/package/asterisk/files/asterisk-chan-bluetooth.conffiles
diff --git a/package/asterisk/ipkg/asterisk-chan-h323.conffiles b/package/asterisk/files/asterisk-chan-h323.conffiles
index fc0858a61..fc0858a61 100644
--- a/package/asterisk/ipkg/asterisk-chan-h323.conffiles
+++ b/package/asterisk/files/asterisk-chan-h323.conffiles
diff --git a/package/asterisk/ipkg/asterisk-chan-iax2.conffiles b/package/asterisk/files/asterisk-chan-iax2.conffiles
index f46a87327..f46a87327 100644
--- a/package/asterisk/ipkg/asterisk-chan-iax2.conffiles
+++ b/package/asterisk/files/asterisk-chan-iax2.conffiles
diff --git a/package/asterisk/ipkg/asterisk-chan-mgcp.conffiles b/package/asterisk/files/asterisk-chan-mgcp.conffiles
index 40a81df8e..40a81df8e 100644
--- a/package/asterisk/ipkg/asterisk-chan-mgcp.conffiles
+++ b/package/asterisk/files/asterisk-chan-mgcp.conffiles
diff --git a/package/asterisk/ipkg/asterisk-chan-skinny.conffiles b/package/asterisk/files/asterisk-chan-skinny.conffiles
index eaf9b6def..eaf9b6def 100644
--- a/package/asterisk/ipkg/asterisk-chan-skinny.conffiles
+++ b/package/asterisk/files/asterisk-chan-skinny.conffiles
diff --git a/package/asterisk/ipkg/asterisk-meetme.conffiles b/package/asterisk/files/asterisk-meetme.conffiles
index 1caab1d4d..1caab1d4d 100644
--- a/package/asterisk/ipkg/asterisk-meetme.conffiles
+++ b/package/asterisk/files/asterisk-meetme.conffiles
diff --git a/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles b/package/asterisk/files/asterisk-pbx-dundi.conffiles
index ab116b5d1..ab116b5d1 100644
--- a/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles
+++ b/package/asterisk/files/asterisk-pbx-dundi.conffiles
diff --git a/package/asterisk/ipkg/asterisk-pgsql.conffiles b/package/asterisk/files/asterisk-pgsql.conffiles
index 8b5cffe40..8b5cffe40 100644
--- a/package/asterisk/ipkg/asterisk-pgsql.conffiles
+++ b/package/asterisk/files/asterisk-pgsql.conffiles
diff --git a/package/asterisk/ipkg/asterisk-voicemail.conffiles b/package/asterisk/files/asterisk-voicemail.conffiles
index 1c80f057a..1c80f057a 100644
--- a/package/asterisk/ipkg/asterisk-voicemail.conffiles
+++ b/package/asterisk/files/asterisk-voicemail.conffiles
diff --git a/package/asterisk/ipkg/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles
index 5f805dedb..5f805dedb 100644
--- a/package/asterisk/ipkg/asterisk.conffiles
+++ b/package/asterisk/files/asterisk.conffiles
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index fcbb52612..01a4edd51 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG asterisk
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/asterisk/ipkg/asterisk.postinst b/package/asterisk/files/asterisk.postinst
index 1186b2645..1186b2645 100644
--- a/package/asterisk/ipkg/asterisk.postinst
+++ b/package/asterisk/files/asterisk.postinst
diff --git a/package/asterisk/ipkg/asterisk-chan-bluetooth.control b/package/asterisk/ipkg/asterisk-chan-bluetooth.control
deleted file mode 100644
index c79d038bb..000000000
--- a/package/asterisk/ipkg/asterisk-chan-bluetooth.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-bluetooth
-Priority: optional
-Section: net
-Description: Bluetooth HandsFreeProfile support for Asterisk
-Depends: asterisk, bluez-libs
diff --git a/package/asterisk/ipkg/asterisk-chan-h323.control b/package/asterisk/ipkg/asterisk-chan-h323.control
deleted file mode 100644
index f3a18ba99..000000000
--- a/package/asterisk/ipkg/asterisk-chan-h323.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-h323
-Priority: optional
-Section: net
-Description: H.323 support for Asterisk
-Depends: asterisk, libpthread, uclibc++
diff --git a/package/asterisk/ipkg/asterisk-chan-iax2.control b/package/asterisk/ipkg/asterisk-chan-iax2.control
deleted file mode 100644
index 55f71f446..000000000
--- a/package/asterisk/ipkg/asterisk-chan-iax2.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-iax2
-Priority: optional
-Section: net
-Description: Asterisk Channel for the Inter Asterisk Protocol
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-chan-mgcp.control b/package/asterisk/ipkg/asterisk-chan-mgcp.control
deleted file mode 100644
index 78ea3b649..000000000
--- a/package/asterisk/ipkg/asterisk-chan-mgcp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-mgcp
-Priority: optional
-Section: net
-Description: a Media Gateway Control Protocol implementation for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-chan-misdn.control b/package/asterisk/ipkg/asterisk-chan-misdn.control
deleted file mode 100644
index bcc7f384e..000000000
--- a/package/asterisk/ipkg/asterisk-chan-misdn.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-misdn
-Priority: optional
-Section: net
-Depends: asterisk
-Description: Asterisk Channel for the mISDN ISDN systems
diff --git a/package/asterisk/ipkg/asterisk-chan-skinny.control b/package/asterisk/ipkg/asterisk-chan-skinny.control
deleted file mode 100644
index 3933e33db..000000000
--- a/package/asterisk/ipkg/asterisk-chan-skinny.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-chan-skinny
-Priority: optional
-Section: net
-Description: a Skinny Client Control Protocol implementation for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-codec-gsm.control b/package/asterisk/ipkg/asterisk-codec-gsm.control
deleted file mode 100644
index f26044d2b..000000000
--- a/package/asterisk/ipkg/asterisk-codec-gsm.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-codec-gsm
-Priority: optional
-Section: net
-Description: a GSM Codec Translator for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-codec-speex.control b/package/asterisk/ipkg/asterisk-codec-speex.control
deleted file mode 100644
index 61eb088f7..000000000
--- a/package/asterisk/ipkg/asterisk-codec-speex.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-codec-speex
-Priority: optional
-Section: net
-Description: a Speex/PCM16 Codec Translator for Asterisk
-Depends: asterisk, libspeex
diff --git a/package/asterisk/ipkg/asterisk-meetme.control b/package/asterisk/ipkg/asterisk-meetme.control
deleted file mode 100644
index 8b031d210..000000000
--- a/package/asterisk/ipkg/asterisk-meetme.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-meetme
-Priority: optional
-Section: net
-Description: MeetMe support files for asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-pbx-dundi.control b/package/asterisk/ipkg/asterisk-pbx-dundi.control
deleted file mode 100644
index 6579e2594..000000000
--- a/package/asterisk/ipkg/asterisk-pbx-dundi.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-pbx-dundi
-Priority: optional
-Section: net
-Description: Distributed Universal Number Discovery (DUNDi) support for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-pgsql.control b/package/asterisk/ipkg/asterisk-pgsql.control
deleted file mode 100644
index beece08a5..000000000
--- a/package/asterisk/ipkg/asterisk-pgsql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-pgsql
-Priority: optional
-Section: net
-Description: PostgreSQL modules for Asterisk
-Depends: asterisk, libpq, zlib
diff --git a/package/asterisk/ipkg/asterisk-res-agi.control b/package/asterisk/ipkg/asterisk-res-agi.control
deleted file mode 100644
index 44f7170aa..000000000
--- a/package/asterisk/ipkg/asterisk-res-agi.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-res-agi
-Priority: optional
-Section: net
-Description: Asterisk Gateway Interface module
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-sounds.control b/package/asterisk/ipkg/asterisk-sounds.control
deleted file mode 100644
index a63bbef10..000000000
--- a/package/asterisk/ipkg/asterisk-sounds.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-sounds
-Priority: optional
-Section: net
-Description: a sounds collection for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk-sqlite.control b/package/asterisk/ipkg/asterisk-sqlite.control
deleted file mode 100644
index 3968dd19d..000000000
--- a/package/asterisk/ipkg/asterisk-sqlite.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-sqlite
-Priority: optional
-Section: net
-Description: SQLite modules for Asterisk
-Depends: asterisk, libsqlite
diff --git a/package/asterisk/ipkg/asterisk-voicemail.control b/package/asterisk/ipkg/asterisk-voicemail.control
deleted file mode 100644
index c7b51311c..000000000
--- a/package/asterisk/ipkg/asterisk-voicemail.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk-voicemail
-Priority: optional
-Section: net
-Description: VoiceMail related modules for Asterisk
-Depends: asterisk
diff --git a/package/asterisk/ipkg/asterisk.control b/package/asterisk/ipkg/asterisk.control
deleted file mode 100644
index 13075d791..000000000
--- a/package/asterisk/ipkg/asterisk.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: asterisk
-Priority: optional
-Section: net
-Depends: libncurses, libpthread
-Description: An open source PBX
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 5c71f7376..ec903cdf7 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
-MASTER_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
+PKG_DESCR:=		TFTP client
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libreadline libncurses
+PKG_URL:=		http://freshmeat.net/projects/atftp
+PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
+PKG_DESCR_1:=		TFTP server
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
 CONFIGURE_STYLE=	gnu
diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control
deleted file mode 100644
index 83b1858c4..000000000
--- a/package/atftp/ipkg/atftp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: atftp
-Priority: optional
-Section: net
-Description: tftp client
-Depends: libreadline, libncurses
diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control
deleted file mode 100644
index 94f49f3f7..000000000
--- a/package/atftp/ipkg/atftpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: atftpd
-Priority: optional
-Section: net
-Description: tftp server
-Depends: libreadline, libpcre
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index 97e18dd39..f39bec8c5 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -6,26 +6,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		autossh
-PKG_VERSION:=		1.3
+PKG_VERSION:=		1.4b
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0e7ec62eeca5d1b197f3ef2d0f0d417f
-MASTER_SITES:=		http://www.harding.motd.ca/autossh/
+PKG_MD5SUM:=		8f9aa006f6f69e912d3c2f504622d6f7
+PKG_DESCR:=		Automatically restart SSH sessions and tunnels
+PKG_SECTION:=		net
+PKG_DEPENDS:=		openssh-client
+PKG_URL:=		http://www.harding.motd.ca/autossh
+PKG_SITES:=		http://www.harding.motd.ca/autossh/
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tgz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-
-TCFLAGS+=		-Wall -DSSH_PATH=\\\"/usr/bin/ssh\\\"\ \
-			-DVER=\\\"$(PKG_VERSION)\\\"\"
-MAKE_FLAGS+=		CC="$(TARGET_CC)" BINDIR=/usr/bin MANDIR=/usr/man
-BUILD_STYLE=		auto
+$(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
-	cp $(WRKBUILD)/Makefile.linux $(WRKBUILD)/Makefile
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
 
 do-install:
-	echo $(CC)
 	$(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/
 
diff --git a/package/autossh/ipkg/autossh.control b/package/autossh/ipkg/autossh.control
deleted file mode 100644
index 2916e3851..000000000
--- a/package/autossh/ipkg/autossh.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: autossh
-Priority: optional
-Section: net
-Depends: openssh-client
-Description: Autossh client
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 3397dc146..83834b872 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -6,22 +6,26 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		avahi
-PKG_VERSION:=		0.6.16
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		3cbc460bbd55bae35f7b57443c063640
-MASTER_SITES:=		http://avahi.org/download/
+PKG_VERSION:=		0.6.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
+PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libavahi libdaemon libexpat
+PKG_URL:=		http://avahi.org
+PKG_SITES:=		http://avahi.org/download/
+PKG_DEPENDS_1:=		libavahi libdaemon avahi-daemon
+PKG_DESCR_1:=		Unicast DNS server from mDNS/DNS-SD configuration daemon
+PKG_DESCR_2:=		DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
 
-TCFLAGS+=		-DNDEBUG
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes \
-			ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+=	--disable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
@@ -50,8 +54,6 @@ CONFIGURE_ARGS+=	--disable-glib \
 			--with-avahi-group=avahi
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-#XXX maybe unneeded?
-#XAKE_FLAGS+=		PKG_CONFIG_PATH=${STAGING_DIR}/usr/lib/pkgconfig
 
 post-install:
 	# avahi daemon
@@ -62,9 +64,6 @@ post-install:
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
 	${INSTALL_DATA} ./files/service-ssh \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
-	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/init.d
-	${INSTALL_BIN} ./files/avahi-daemon.init \
-		${IDIR_AVAHI_DAEMON}/etc/init.d/avahi-daemon
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
 	# avahi dnsconfd
diff --git a/package/avahi/ipkg/avahi-daemon.conffiles b/package/avahi/files/avahi-daemon.conffiles
index 46379ed96..46379ed96 100644
--- a/package/avahi/ipkg/avahi-daemon.conffiles
+++ b/package/avahi/files/avahi-daemon.conffiles
diff --git a/package/avahi/files/avahi-daemon.init b/package/avahi/files/avahi-daemon.init
index 06d0863fc..79170b840 100644
--- a/package/avahi/files/avahi-daemon.init
+++ b/package/avahi/files/avahi-daemon.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 75
+#PKG avahi-daemon
+#INIT 75
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/avahi/ipkg/avahi-daemon.postinst b/package/avahi/files/avahi-daemon.postinst
index 0e3e13912..0e3e13912 100644
--- a/package/avahi/ipkg/avahi-daemon.postinst
+++ b/package/avahi/files/avahi-daemon.postinst
diff --git a/package/avahi/ipkg/avahi-daemon.control b/package/avahi/ipkg/avahi-daemon.control
deleted file mode 100644
index f68a690fe..000000000
--- a/package/avahi/ipkg/avahi-daemon.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: avahi-daemon
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, libexpat
-Description: an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)
diff --git a/package/avahi/ipkg/avahi-dnsconfd.control b/package/avahi/ipkg/avahi-dnsconfd.control
deleted file mode 100644
index 1213a0e7b..000000000
--- a/package/avahi/ipkg/avahi-dnsconfd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: avahi-dnsconfd
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, avahi-daemon
-Description: an Unicast DNS server from mDNS/DNS-SD configuration daemon
diff --git a/package/avahi/ipkg/libavahi.control b/package/avahi/ipkg/libavahi.control
deleted file mode 100644
index 4912296bc..000000000
--- a/package/avahi/ipkg/libavahi.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libavahi
-Priority: optional
-Section: libs
-Description: an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 530ef0b6a..7f4f76097 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -6,17 +6,25 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		axtls
-PKG_VERSION:=		1.1.0
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		4a834edc93f46fdca4f9c93ec665376e
+PKG_VERSION:=		1.2.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		03471b5a5874e2ce86025f24b3fa0958
+PKG_DESCR:=		small embedded webserver
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libaxtls
+PKG_URL:=		http://axtls.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
+
+PKG_DESCR_1:=		small tls library
+PKG_SECTION_1:=		libs
+
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
 WRKDIST=		${WRKDIR}/axTLS
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
 
 BUILD_STYLE=		auto
 XAKE_FLAGS+=		STRIP='' \
@@ -33,11 +41,8 @@ do-install:
 	${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib
 	$(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/
 	# awhttpd server
-	${INSTALL_DIR} ${IDIR_AXHTTPD}/etc/init.d
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/www
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin
 	${INSTALL_BIN} $(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)/usr/sbin/
-	$(INSTALL_BIN) ./files/axhttpd.init \
-	    $(IDIR_AXHTTPD)/etc/init.d/axhttpd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init
index 70ccc48d5..bc11e0b4c 100644
--- a/package/axtls/files/axhttpd.init
+++ b/package/axtls/files/axhttpd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG axhttpd
+#INIT 80
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/axtls/ipkg/axhttpd.postinst b/package/axtls/files/axhttpd.postinst
index d19a62e8a..d19a62e8a 100644
--- a/package/axtls/ipkg/axhttpd.postinst
+++ b/package/axtls/files/axhttpd.postinst
diff --git a/package/axtls/files/config b/package/axtls/files/config
index caa5dc35a..ed4e64806 100644
--- a/package/axtls/files/config
+++ b/package/axtls/files/config
@@ -4,7 +4,6 @@
 HAVE_DOT_CONFIG=y
 CONFIG_PLATFORM_LINUX=y
 # CONFIG_PLATFORM_CYGWIN is not set
-# CONFIG_PLATFORM_SOLARIS is not set
 # CONFIG_PLATFORM_WIN32 is not set
 
 #
@@ -12,10 +11,9 @@ CONFIG_PLATFORM_LINUX=y
 #
 PREFIX="/usr"
 CONFIG_DEBUG=y
-# CONFIG_VISUAL_STUDIO_6_0 is not set
+# CONFIG_STRIP_UNWANTED_SECTIONS is not set
 # CONFIG_VISUAL_STUDIO_7_0 is not set
 # CONFIG_VISUAL_STUDIO_8_0 is not set
-CONFIG_VISUAL_STUDIO_6_0_BASE=""
 CONFIG_VISUAL_STUDIO_7_0_BASE=""
 CONFIG_VISUAL_STUDIO_8_0_BASE=""
 CONFIG_EXTRA_CFLAGS_OPTIONS=""
@@ -33,15 +31,23 @@ CONFIG_SSL_ENABLE_CLIENT=y
 CONFIG_SSL_PROT_MEDIUM=y
 # CONFIG_SSL_PROT_HIGH is not set
 CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+# CONFIG_SSL_GENERATE_X509_CERT is not set
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
 CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
 CONFIG_SSL_HAS_PEM=y
 CONFIG_SSL_USE_PKCS12=y
 CONFIG_SSL_EXPIRY_TIME=24
 CONFIG_X509_MAX_CA_CERTS=4
 CONFIG_SSL_MAX_CERTS=2
-# CONFIG_SSLCTX_MUTEXING is not set
+# CONFIG_SSL_CTX_MUTEXING is not set
 CONFIG_USE_DEV_URANDOM=y
 # CONFIG_WIN32_USE_CRYPTO_LIB is not set
+# CONFIG_OPENSSL_COMPATIBLE is not set
 # CONFIG_PERFORMANCE_TESTING is not set
 # CONFIG_SSL_TEST is not set
 CONFIG_AXHTTPD=y
@@ -50,17 +56,26 @@ CONFIG_AXHTTPD=y
 # Axhttpd Configuration
 #
 # CONFIG_HTTP_STATIC_BUILD is not set
+CONFIG_HTTP_PORT=80
 CONFIG_HTTP_HTTPS_PORT=443
 CONFIG_HTTP_SESSION_CACHE_SIZE=5
 CONFIG_HTTP_WEBROOT="/www"
-CONFIG_HTTP_PORT=80
 CONFIG_HTTP_TIMEOUT=0
+
+#
+# CGI
+#
 CONFIG_HTTP_HAS_CGI=y
-CONFIG_HTTP_CGI_EXTENSION=".cgi"
+CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp"
+# CONFIG_HTTP_ENABLE_LUA is not set
+CONFIG_HTTP_LUA_PREFIX=""
+CONFIG_HTTP_LUA_CGI_LAUNCHER=""
+# CONFIG_HTTP_BUILD_LUA is not set
 CONFIG_HTTP_DIRECTORIES=y
-# CONFIG_HTTP_PERM_CHECK is not set
+CONFIG_HTTP_HAS_AUTHORIZATION=y
 # CONFIG_HTTP_HAS_IPV6 is not set
-CONFIG_HTTP_ALL_MIME_TYPES=y
+CONFIG_HTTP_ENABLE_DIFFERENT_USER=y
+CONFIG_HTTP_USER="axhttp"
 CONFIG_HTTP_VERBOSE=y
 CONFIG_HTTP_IS_DAEMON=y
 
@@ -76,6 +91,8 @@ CONFIG_JAVA_HOME=""
 # CONFIG_PERL_BINDINGS is not set
 CONFIG_PERL_CORE=""
 CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
 
 #
 # Samples
@@ -86,6 +103,7 @@ CONFIG_PERL_LIB=""
 # CONFIG_VBNET_SAMPLES is not set
 # CONFIG_JAVA_SAMPLES is not set
 # CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
 
 #
 # BigInt Options
diff --git a/package/axtls/ipkg/axhttpd.control b/package/axtls/ipkg/axhttpd.control
deleted file mode 100644
index e19f3fc4c..000000000
--- a/package/axtls/ipkg/axhttpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: axhttpd
-Priority: optional
-Section: net
-Depends: libaxtls
-Description: small embedded webserver
diff --git a/package/axtls/ipkg/libaxtls.control b/package/axtls/ipkg/libaxtls.control
deleted file mode 100644
index b9c9d4be4..000000000
--- a/package/axtls/ipkg/libaxtls.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libaxtls
-Priority: optional
-Section: libs
-Description: an embedded client/server TLSv1 SSL implementation
-Depends:
diff --git a/package/axtls/patches/patch-httpd_main_c b/package/axtls/patches/patch-httpd_main_c
deleted file mode 100644
index b4017803e..000000000
--- a/package/axtls/patches/patch-httpd_main_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id$
---- axTLS.orig/httpd/main.c	2007-01-31 22:35:53.000000000 +0100
-+++ axTLS/httpd/main.c	2007-02-10 12:15:20.000000000 +0100
-@@ -98,11 +98,12 @@ int main(int argc, char *argv[]) 
-     WSADATA wsaData;
-     WSAStartup(wVersionRequested,&wsaData);
- #else
--    if (getuid() == 0)  /* change our uid if we are root */
--    {
--        setgid(32767);
--        setuid(32767);
--    }
-+    /* we can't bind to port 80/443 if we are nobody ?! */
-+    //if (getuid() == 0)  /* change our uid if we are root */
-+    //{
-+    //   setgid(32767);
-+    //    setuid(32767);
-+    //}
- 
-     signal(SIGQUIT, die);
-     signal(SIGPIPE, SIG_IGN);
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6f503b2c7..62eebd4c1 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,6 +9,9 @@ include $(TOPDIR)/mk/rootfs.mk
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		5
+PKG_DESCR:=		basic filesystem structure and scripts
+PKG_SECTION:=		base
+
 WRKDIST=		${WRKDIR}/base-files
 NO_DISTFILES:=		1
 ifeq ($(CPU_ARCH),x86_64)
@@ -22,18 +25,11 @@ ICONTROL_ADDON_BASE_FILES=	"Package: base-files-${PKG_ID}"
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-install:
 	$(CP) ./files/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES)
-	typeset -i REV; \
-	if fgrep xml .svn/entries >/dev/null 2>&1; then \
-		let REV="$$(sed -n '/revision=/s/^.*"\([0-9]*\)".*$$/\1/p' \
-		    .svn/entries)"; \
-	else \
-		let REV="$$(head -n 4 .svn/entries | tail -1)"; \
-	fi; ${SED} 's,$$R,'$$REV,g $(IDIR_BASE_FILES)/etc/banner
 	$(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells
diff --git a/package/base-files/ipkg/base-files.conffiles b/package/base-files/files/base-files.conffiles
index 2495e2ee4..2495e2ee4 100644
--- a/package/base-files/ipkg/base-files.conffiles
+++ b/package/base-files/files/base-files.conffiles
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index c81d7ea65..f71e46240 100644
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,5 +1,5 @@
 #!/bin/sh
-#FWINIT 10
+#INIT 10
 [[ $1 = autostart ]] || exit 0
 
 . /etc/functions.sh
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index 018d52a43..e5b655bb6 100644
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/files/etc/init.d/done
@@ -1,4 +1,4 @@
 #!/bin/sh
-#FWINIT 98
+#INIT 98
 [[ $1 = autostart ]] && sysctl -p >&-
 exit 0
diff --git a/package/base-files/files/etc/init.d/rcK b/package/base-files/files/etc/init.d/rcK
index 3cf210fa7..e94d1a296 100755
--- a/package/base-files/files/etc/init.d/rcK
+++ b/package/base-files/files/etc/init.d/rcK
@@ -4,7 +4,7 @@ busybox reboot -d 60 -f &		# just in case…
 {
 	[[ -f /proc/diag/led/power ]] && echo f >/proc/diag/led/power
 	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
-	grep '^#FWINIT ' /etc/init.d/* | \
+	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
 		shebang=$(sed -n '1s/^#![	 ]*//p' ${line%%:*})
diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
index f9c47e425..fd56feebf 100755
--- a/package/base-files/files/etc/init.d/rcS
+++ b/package/base-files/files/etc/init.d/rcS
@@ -1,7 +1,7 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 {
-	grep '^#FWINIT ' /etc/init.d/* | \
+	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
 		/bin/sh ${line%%:*} autostart 2>&1
diff --git a/package/base-files/ipkg/base-files.control b/package/base-files/ipkg/base-files.control
deleted file mode 100644
index 00e2d7746..000000000
--- a/package/base-files/ipkg/base-files.control
+++ /dev/null
@@ -1,3 +0,0 @@
-Priority: base
-Section: base
-Description: basic filesystem structure and scripts
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 46a5ebacb..28f4c134d 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		bash
 PKG_VERSION:=		4.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a90a1b5a6db4838483f05438e05e8eb9
-MASTER_SITES:=		http://ftp.gnu.org/gnu/bash/
+PKG_DESCR:=		Bourne-Again SHell
+PKG_SECTION:=		shells
+PKG_URL:=		http://www.gnu.org/software/bash
+PKG_SITES:=		http://ftp.gnu.org/gnu/bash/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		LIBS_FOR_BUILD=''
 CONFIGURE_STYLE=	gnu
diff --git a/package/bash/ipkg/bash.control b/package/bash/ipkg/bash.control
deleted file mode 100644
index 46acdcdbc..000000000
--- a/package/bash/ipkg/bash.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bash
-Priority: optional
-Section: shells
-Description: bash shell
diff --git a/package/bc/Makefile b/package/bc/Makefile
index 63f91c284..f70adad9f 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -9,12 +9,15 @@ PKG_NAME:=		bc
 PKG_VERSION:=		1.06
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
-MASTER_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
+PKG_DESCR:=		An arbitrary precision calculator language
+PKG_SECTION:=		util
+PKG_URL:=		http://www.gnu.org/software/bc
+PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
diff --git a/package/bc/ipkg/bc.control b/package/bc/ipkg/bc.control
deleted file mode 100644
index e22ed5b7c..000000000
--- a/package/bc/ipkg/bc.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bc
-Priority: optional
-Section: util
-Description: An arbitrary precision calculator language
diff --git a/package/bc/ipkg/dc.control b/package/bc/ipkg/dc.control
deleted file mode 100644
index 1ef852500..000000000
--- a/package/bc/ipkg/dc.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dc
-Priority: optional
-Section: util
-Description: An arbitrary precision calculator
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 6ee40f266..56700a4c6 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -9,7 +9,7 @@ PKG_NAME:=		bigreqsproto
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d43f7faa2aac2f0206ea19f031494af1
-MASTER_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/bigreqsproto/ipkg/bigreqsproto.control b/package/bigreqsproto/ipkg/bigreqsproto.control
deleted file mode 100644
index f5fa1d66b..000000000
--- a/package/bigreqsproto/ipkg/bigreqsproto.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bigreqsproto
-Priority: optional
-Section: x11
-Description: Xproto headers
diff --git a/package/bind/Config.in b/package/bind/Config.in
index b9eef008a..1286057ba 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -8,21 +8,6 @@ config ADK_DUMMY_BIND
 	tristate
 	default n
 
-config ADK_PACKAGE_BIND_TOOLS
-	prompt "bind-tools........................ Bind administration tools"
-	tristate
-	default n
-	depends ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  dig, host,  nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf,
-	  named-checkzone, rndc, rndc-confgen
-
-	  http://www.isc.org/sw/bind/
-
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_RNDC
 	prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
 	tristate
@@ -32,11 +17,8 @@ config ADK_PACKAGE_BIND_RNDC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  rndc, rndc-confgen
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_CHECK
 	prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
 	tristate
@@ -46,11 +28,8 @@ config ADK_PACKAGE_BIND_CHECK
 	select ADK_PACKAGE_LIBBIND
 	help
 	  named-checkconf, named-checkzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_DNSSEC
 	prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
 	tristate
@@ -60,11 +39,8 @@ config ADK_PACKAGE_BIND_DNSSEC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  dnssec-keygen, dnssec-signzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_HOST
 	prompt "bind-host......................... A simple DNS client"
 	tristate
@@ -73,11 +49,9 @@ config ADK_PACKAGE_BIND_HOST
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  host
-
+	  host utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
 
 config ADK_PACKAGE_BIND_DIG
 	prompt "bind-dig.......................... A DNS client"
@@ -87,12 +61,9 @@ config ADK_PACKAGE_BIND_DIG
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  dig
-
+	  dig utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 
 config ADK_PACKAGE_BIND_CLIENT
 	prompt "bind-client....................... A dynamic DNS client"
@@ -103,11 +74,8 @@ config ADK_PACKAGE_BIND_CLIENT
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS dynamic client (nsupdate)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_SERVER
 	prompt "bind-server....................... A DNS server"
 	tristate
@@ -117,12 +85,8 @@ config ADK_PACKAGE_BIND_SERVER
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS server (named)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
-
 config ADK_PACKAGE_LIBBIND
         prompt "libbind........................... Support library for the bind tools and dns server/client."
         tristate
@@ -131,6 +95,3 @@ config ADK_PACKAGE_LIBBIND
         select ADK_COMPILE_BIND
         help
           http://www.isc.org/sw/bind/
-
-          Depends: libopenssl
-
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 6e668008c..b527e13b1 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -9,19 +9,32 @@ PKG_NAME:=		bind
 PKG_VERSION:=		9.4.1
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
-MASTER_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+PKG_DESCR:=		popular DNS server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl libbind
+PKG_URL:=		https://www.isc.org/software/bind
+PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+
+PKG_DESCR_1:=		dynamic dns client (nsupdate utility)
+PKG_DESCR_2:=		Support library for the bind tools and dns server/client
+PKG_DESCR_3:=		rndc & rndc-confgen utilities
+PKG_DESCR_4:=		named-checkconf & named-checkzone utilities
+PKG_DESCR_5:=		dnssec-keygen & dnssec-signzone utilities
+PKG_DESCR_6:=		host utility
+PKG_DESCR_7:=		dig utility
+
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}"
@@ -42,26 +55,12 @@ pre-build:
 post-install:
 	# bind server
 	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin
-	${INSTALL_DIR} ${IDIR_BIND_SERVER}/etc/init.d
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
-	${INSTALL_BIN} ./files/named.init \
-		${IDIR_BIND_SERVER}/etc/init.d/named
 	find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf
 	# nsupdate
 	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
-	# bind all tools
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/bin
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_TOOLS}/usr/sbin/
 	# rndc
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
@@ -82,11 +81,11 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/
 	# bind lib
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.30 ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/ipkg/bind-server.conffiles b/package/bind/files/bind-server.conffiles
index c4cfe37d5..c4cfe37d5 100644
--- a/package/bind/ipkg/bind-server.conffiles
+++ b/package/bind/files/bind-server.conffiles
diff --git a/package/bind/ipkg/bind-server.postinst b/package/bind/files/bind-server.postinst
index bca89fd22..bca89fd22 100644
--- a/package/bind/ipkg/bind-server.postinst
+++ b/package/bind/files/bind-server.postinst
diff --git a/package/bind/files/named.init b/package/bind/files/named.init
index 1838eefee..ce0c0abfa 100644
--- a/package/bind/files/named.init
+++ b/package/bind/files/named.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG bind-server
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/bind/ipkg/bind-check.control b/package/bind/ipkg/bind-check.control
deleted file mode 100644
index ba90d8274..000000000
--- a/package/bind/ipkg/bind-check.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-check
-Priority: optional
-Section: net
-Description: named-checkconf & named-checkzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-client.control b/package/bind/ipkg/bind-client.control
deleted file mode 100644
index fa20c18a3..000000000
--- a/package/bind/ipkg/bind-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-client
-Priority: optional
-Section: net
-Description: dynamic dns client
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dig.control b/package/bind/ipkg/bind-dig.control
deleted file mode 100644
index e91e30066..000000000
--- a/package/bind/ipkg/bind-dig.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dig
-Priority: optional
-Section: net
-Description: dig utility
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dnssec.control b/package/bind/ipkg/bind-dnssec.control
deleted file mode 100644
index c7c213617..000000000
--- a/package/bind/ipkg/bind-dnssec.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dnssec
-Priority: optional
-Section: net
-Description: dnssec-keygen & dnssec-signzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-host.control b/package/bind/ipkg/bind-host.control
deleted file mode 100644
index 20440381a..000000000
--- a/package/bind/ipkg/bind-host.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-host
-Priority: optional
-Section: net
-Description: host utility
-Depends: libopenssl libbind
-
diff --git a/package/bind/ipkg/bind-rndc.control b/package/bind/ipkg/bind-rndc.control
deleted file mode 100644
index a0eee7ebb..000000000
--- a/package/bind/ipkg/bind-rndc.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-rndc
-Priority: optional
-Section: net
-Description: rndc & rndc-confgen utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-server.control b/package/bind/ipkg/bind-server.control
deleted file mode 100644
index 73b10d2f2..000000000
--- a/package/bind/ipkg/bind-server.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-server
-Priority: optional
-Section: net
-Description: popular dns server
-Depends: libopenssl libbind
-Conflicts: dnsmasq
diff --git a/package/bind/ipkg/bind-tools.control b/package/bind/ipkg/bind-tools.control
deleted file mode 100644
index 623d0a547..000000000
--- a/package/bind/ipkg/bind-tools.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-tools
-Priority: optional
-Section: net
-Description: dig, host, nslookup, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, named-checkzone, rndc, rndc-confgen
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/libbind.control b/package/bind/ipkg/libbind.control
deleted file mode 100644
index 5b4e86674..000000000
--- a/package/bind/ipkg/libbind.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libbind
-Priority: optional
-Section: libs
-Description: Support library for the bind tools and dns server/client.
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 9409ab002..57b564df0 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -5,9 +5,13 @@
 
 include ${TOPDIR}/rules.mk
 include ${TOPDIR}/toolchain/binutils/Makefile.inc
+
+PKG_DESCR:=		binary utilities (nm, objdump, ar, as, ..)
+PKG_SECTION:=		comp
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BINUTILS,binutils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-werror
@@ -16,7 +20,7 @@ INSTALL_STYLE=		auto
 
 post-patch:
 	${PREVENT_PATCH} ${PATCH} ${WRKDIST} \
-	    ${TOPDIR}/toolchain/binutils/${BINUTILS_VERSION} \*.patch
+	    ${TOPDIR}/toolchain/binutils/patches \*.patch
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BINUTILS}/usr/lib
diff --git a/package/binutils/ipkg/binutils.control b/package/binutils/ipkg/binutils.control
deleted file mode 100644
index bf98f2634..000000000
--- a/package/binutils/ipkg/binutils.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: binutils
-Priority: optional
-Section: comp
-Description: binary utilities 
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 364c084f2..ea158d197 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -9,14 +9,18 @@ PKG_NAME:=		bitlbee
 PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
-MASTER_SITES:=		http://get.bitlbee.org/src/ \
+PKG_DESCR:=		IRC gateway to IM chat networks
+PKG_SECTION:=		net
+PKG_DEPENDS:=		glib2 libopenssl libiconv
+PKG_URL:=		http://www.bitlbee.org
+PKG_SITES:=		http://get.bitlbee.org/src/ \
 			http://get.bitlbee.be/src/ \
 			http://get.us.bitlbee.org/src/ \
 			http://ftp.snt.utwente.nl/pub/software/bitlbee/src/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 ifeq ($(ADK_IPV6),y)
 IPV6+=	--ipv6=1
 else
@@ -57,12 +61,8 @@ post-configure:
 		${WRKBUILD}/Makefile.settings
 
 post-install:
-	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee
-	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/init.d
-	${INSTALL_DIR} ${IDIR_BITLBEE}/usr/sbin
+	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin
-	${INSTALL_BIN} ./files/bitlbee.init \
-		${IDIR_BITLBEE}/etc/init.d/bitlbee
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bitlbee/ipkg/bitlbee.conffiles b/package/bitlbee/files/bitlbee.conffiles
index 2ccc958d5..2ccc958d5 100644
--- a/package/bitlbee/ipkg/bitlbee.conffiles
+++ b/package/bitlbee/files/bitlbee.conffiles
diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init
index 3ff950a9c..1ff40c754 100644
--- a/package/bitlbee/files/bitlbee.init
+++ b/package/bitlbee/files/bitlbee.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG bitlbee
+#INIT 80
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/bitlbee/ipkg/bitlbee.postinst b/package/bitlbee/files/bitlbee.postinst
index a8e3b2ec4..a8e3b2ec4 100644
--- a/package/bitlbee/ipkg/bitlbee.postinst
+++ b/package/bitlbee/files/bitlbee.postinst
diff --git a/package/bitlbee/ipkg/bitlbee.control b/package/bitlbee/ipkg/bitlbee.control
deleted file mode 100644
index 37ca895c8..000000000
--- a/package/bitlbee/ipkg/bitlbee.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bitlbee
-Priority: optional
-Section: net
-Depends: glib2, libopenssl, libiconv
-Description: IRC gateway to IM chat networks
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index fd8c9d35c..67c7723dc 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		bluez-firmware
 PKG_VERSION:=		1.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1cc3cefad872e937e05de5a0a2b390dd
-MASTER_SITES:=		http://bluez.sourceforge.net/download/
+PKG_DESCR:=		Bluez firmware for BCM2033
+PKG_SECTION:=		bluetooth
+PKG_DEPENDS:=		kmod-bluetooth bluez-libs bluez-utils
+PKG_URL:=		http://www.bluez.org
+PKG_SITES:=		http://bluez.sourceforge.net/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--libdir=/lib
diff --git a/package/bluez-firmware/ipkg/bluez-firmware.control b/package/bluez-firmware/ipkg/bluez-firmware.control
deleted file mode 100644
index 4b5a794ff..000000000
--- a/package/bluez-firmware/ipkg/bluez-firmware.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bluez-firmware
-Priority: optional
-Section: bluetooth
-Description: Bluez firmware for BCM2033
-Depends: kmod-bluetooth, bluez-libs, bluez-utils
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index ff067cf0f..4dd1467a5 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -6,14 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.12
+PKG_VERSION:=		4.40
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e599d7f4ed7e022c85e485934f29a340
-MASTER_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
+PKG_MD5SUM:=		a25fa37c97c309338649f6a5fd4cea76
+PKG_DESCR:=		bluetooth libraries and applications
+PKG_SECTION:=		bluetooth
+PKG_DEPENDS:=		kmod-bluetooth
+PKG_URL:=		http://www.bluez.org
+PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-tools \
@@ -40,8 +44,5 @@ post-install:
 	    ${IDIR_BLUEZ}/etc/bluetooth/
 	$(INSTALL_DATA) $(WRKINST)/etc/dbus-1/system.d/bluetooth.conf \
 		$(IDIR_BLUEZ)/etc/dbus-1/system.d
-	${INSTALL_DIR} ${IDIR_BLUEZ}/etc/init.d
-	${INSTALL_BIN} ./files/bluez.init \
-		${IDIR_BLUEZ}/etc/init.d/bluez
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init
index 20c128ad0..6a61d38cd 100644
--- a/package/bluez/files/bluez.init
+++ b/package/bluez/files/bluez.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 90
+#PKG bluez 
+#INIT 90
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/bluez/ipkg/bluez.control b/package/bluez/ipkg/bluez.control
deleted file mode 100644
index 0b32376ad..000000000
--- a/package/bluez/ipkg/bluez.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bluez
-Priority: optional
-Section: net
-Description: Bluez libs and apps
-Depends: kmod-bluetooth
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index 5962fb3d8..1390a7a34 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -5,36 +5,31 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=			bogofilter
-PKG_VERSION:=		1.1.3
+PKG_NAME:=		bogofilter
+PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a816f509324ccb9946a4d89fefe525e1
-MASTER_SITES:=		http://ftp.debian.org/debian/pool/main/b/bogofilter/
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
+PKG_MD5SUM:=		4bbc9adc30d4f8e3a547f9be18a1cb74
+PKG_DESCR:=		mail filter
+PKG_SECTION:=		mail
+PKG_DEPENDS:=		libdb libiconv
+PKG_URL:=		http://bogofilter.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BOGOFILTER,bogofilter,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_c_bigendian=no \
-			ac_cv_sizeof_off_t=8 \
-			ac_cv_sizeof_int=4 \
-			ac_cv_sizeof_long=4 \
-		    LIBS="-liconv"
+CONFIGURE_STYLE=	autotool gnu
+CONFIGURE_ENV+=		LIBS="-liconv"
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
-					--without-libqdbm-prefix \
-					--with-included-gsl \
-					--with-libdb-prefix=${STAGING_DIR}/usr \
-					--disable-transactions
-#					--without-libdb-prefix
+			--without-libqdbm-prefix \
+			--with-included-gsl \
+			--with-libdb-prefix=${STAGING_DIR}/usr \
+			--disable-transactions
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
-PKG_DEPENDS:=		libdb libiconv
-
 post-install:
-	echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_BOGOFILTER}/CONTROL/control
 	${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/
 ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOUTIL},y)
diff --git a/package/bogofilter/ipkg/bogofilter.control b/package/bogofilter/ipkg/bogofilter.control
deleted file mode 100644
index ef205f2d7..000000000
--- a/package/bogofilter/ipkg/bogofilter.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bogofilter
-Priority: optional
-Section: mail
-Description: Mail filter
diff --git a/package/bogofilter/patches/patch-config_in b/package/bogofilter/patches/patch-config_in
deleted file mode 100644
index 11648db39..000000000
--- a/package/bogofilter/patches/patch-config_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id$
---- bogofilter-1.1.3.orig/config.in	2006-12-03 05:17:24.000000000 +0100
-+++ bogofilter-1.1.3/config.in	2007-03-29 19:28:01.000000000 +0200
-@@ -51,10 +51,6 @@
- /* Have suitable db.h header */
- #undef HAVE_DB_H
- 
--/* Define to 1 if you have the declaration of `db_create', and to 0 if you
--   don't. */
--#undef HAVE_DECL_DB_CREATE
--
- /* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
-    */
- #undef HAVE_DECL_GETOPT
diff --git a/package/bogofilter/patches/patch-configure b/package/bogofilter/patches/patch-configure
deleted file mode 100644
index 165de8409..000000000
--- a/package/bogofilter/patches/patch-configure
+++ /dev/null
@@ -1,281 +0,0 @@
-$Id$
---- bogofilter-1.1.3.orig/configure	2006-12-03 05:17:15.000000000 +0100
-+++ bogofilter-1.1.3/configure	2007-03-29 19:27:35.000000000 +0200
-@@ -13464,238 +13464,55 @@ echo "${ECHO_T}$LIBDB" >&6; }
- 
- 		saveLIBS="$LIBS"
- 	LIBS="$LIBS $LIBDB"
--	{ echo "$as_me:$LINENO: checking if a program can be linked against Berkeley DB and run" >&5
--echo $ECHO_N "checking if a program can be linked against Berkeley DB and run... $ECHO_C" >&6; }
--	if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
-+#	AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run)
-+#	AC_RUN_IFELSE(
-+#	AC_LANG_PROGRAM([[
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
- #include <db.h>
-+#		   ]], [[
-+#return 0;
-+#		   ]]),,
-+#		   [AC_MSG_RESULT(no)
-+#	AC_MSG_ERROR([Cannot run a program linked against libdb.
-+#Did you adjust your library search path to include your libdb?])],)
-+#	AC_MSG_RESULT(yes)
- 
--int
--main ()
--{
--
--return 0;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--	{ { echo "$as_me:$LINENO: error: Cannot run a program linked against libdb.
--Did you adjust your library search path to include your libdb?" >&5
--echo "$as_me: error: Cannot run a program linked against libdb.
--Did you adjust your library search path to include your libdb?" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--	{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--
--			{ echo "$as_me:$LINENO: checking if Berkeley DB header and library versions match" >&5
--echo $ECHO_N "checking if Berkeley DB header and library versions match... $ECHO_C" >&6; }
--	rm -r -f bfadtestdir
--	mkdir bfadtestdir
--	if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--		   #include <stdlib.h>
--		   #include <stdio.h>
-+#	dnl check if header and library of DB library match
-+#	dnl ignore if cross compiling
-+#	AC_MSG_CHECKING(if Berkeley DB header and library versions match)
-+#	rm -r -f bfadtestdir
-+#	mkdir bfadtestdir
-+#	AC_RUN_IFELSE(
-+#	AC_LANG_PROGRAM([[
-+#		   #include <stdlib.h>
-+#		   #include <stdio.h>
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
--		   #include <db.h>
--
--int
--main ()
--{
--
--			int maj, min;
--			(void)db_version(&maj, &min, 0);
--			(void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n",
--				DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min);
--			if (maj != DB_VERSION_MAJOR) exit(1);
--			if (min != DB_VERSION_MINOR) exit(1);
--			exit(0);
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--		   { { echo "$as_me:$LINENO: error: db.h header file and db library version do not match." >&5
--echo "$as_me: error: db.h header file and db library version do not match." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--	{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	{ echo "$as_me:$LINENO: checking whether db_create is declared" >&5
--echo $ECHO_N "checking whether db_create is declared... $ECHO_C" >&6; }
--if test "${ac_cv_have_decl_db_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifdef HAVE_INTTYPES_H
-+#		   #include <db.h>
-+#		   ]], [[
-+#			int maj, min;
-+#			(void)db_version(&maj, &min, 0);
-+#			(void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n",
-+#				DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min);
-+#			if (maj != DB_VERSION_MAJOR) exit(1);
-+#			if (min != DB_VERSION_MINOR) exit(1);
-+#			exit(0);
-+#		   ]]),,
-+#		   [AC_MSG_RESULT(no)
-+#		   AC_MSG_ERROR(db.h header file and db library version do not match.)],)
-+#	AC_MSG_RESULT(yes)
-+#	AC_CHECK_DECLS(db_create,,
-+#	       AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file.
-+#Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
-+#You can download Berkeley DB 4.3.x from http://www.sleepycat.com/]]),
-+#	[[#ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
--#include <db.h>
--
--
--int
--main ()
--{
--#ifndef db_create
--  (void) db_create;
--#endif
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_have_decl_db_create=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl_db_create=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_db_create" >&5
--echo "${ECHO_T}$ac_cv_have_decl_db_create" >&6; }
--if test $ac_cv_have_decl_db_create = yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_DB_CREATE 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_DB_CREATE 0
--_ACEOF
--
--{ { echo "$as_me:$LINENO: error: Can not locate a suitable Berkeley DB db.h header file.
--Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
--You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&5
--echo "$as_me: error: Can not locate a suitable Berkeley DB db.h header file.
--Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
--You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
--
-+#include <db.h>]]
-+#	)
- 	{ echo "$as_me:$LINENO: checking if Berkeley DB supports shared environments" >&5
- echo $ECHO_N "checking if Berkeley DB supports shared environments... $ECHO_C" >&6; }
- 	if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then
diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac
new file mode 100644
index 000000000..8d79ed50f
--- /dev/null
+++ b/package/bogofilter/patches/patch-configure_ac
@@ -0,0 +1,53 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- bogofilter-1.2.0.orig/configure.ac	2009-02-21 21:41:43.000000000 +0100
++++ bogofilter-1.2.0/configure.ac	2009-05-28 19:47:00.466710794 +0200
+@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste
+ 	AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header])
+ 	AC_SUBST(LIBDB)
+ 
+-	dnl check if run-time link works
+-	saveLIBS="$LIBS"
+-	LIBS="$LIBS $LIBDB"
+-	AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run)
+-	AC_RUN_IFELSE(
+-	AC_LANG_PROGRAM([[
+-#ifdef HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-#include <db.h>
+-		   ]], [[
+-return 0;
+-		   ]]),,
+-		   [AC_MSG_RESULT(no)
+-	AC_MSG_ERROR([Cannot run a program linked against libdb.
+-Did you adjust your library search path to include your libdb?])],)
+-	AC_MSG_RESULT(yes)
+-
+-	dnl check if header and library of DB library match
+-	dnl ignore if cross compiling
+-	AC_MSG_CHECKING(if Berkeley DB header and library versions match)
+-	rm -r -f bfadtestdir
+-	mkdir bfadtestdir
+-	AC_RUN_IFELSE(
+-	AC_LANG_PROGRAM([[
+-		   #include <stdlib.h>
+-		   #include <stdio.h>
+-#ifdef HAVE_INTTYPES_H
+-#include <inttypes.h>
+-#endif
+-		   #include <db.h>
+-		   ]], [[
+-			int maj, min;
+-			(void)db_version(&maj, &min, 0);
+-			(void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n",
+-				DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min);
+-			if (maj != DB_VERSION_MAJOR) exit(1);
+-			if (min != DB_VERSION_MINOR) exit(1);
+-			exit(0);
+-		   ]]),,
+-		   [AC_MSG_RESULT(no)
+-		   AC_MSG_ERROR(db.h header file and db library version do not match.)],)
+-	AC_MSG_RESULT(yes)
+ 	AC_CHECK_DECLS(db_create,,
+ 	       AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file.
+ Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index f6363634c..6fbda287c 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -6,16 +6,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bridge-utils
-PKG_VERSION:=		1.0.6
+PKG_VERSION:=		1.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9b7dc52656f5cbec846a7ba3299f73bd
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
+PKG_MD5SUM:=		0182fcac3a2b307113bbec34e5f1c673
+PKG_DESCR:=		Ethernet bridging tools
+PKG_SECTION:=		net
+PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf gnu
 CONFIGURE_ARGS+=	--with-linux-headers=${LINUX_DIR}
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/bridge-utils/ipkg/bridge-utils.control b/package/bridge-utils/ipkg/bridge-utils.control
deleted file mode 100644
index da38f85e9..000000000
--- a/package/bridge-utils/ipkg/bridge-utils.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bridge-utils
-Priority: optional
-Section: net
-Description: Ethernet bridging tools
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index e8edcd12b..94f756c8b 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,14 +9,14 @@ PKG_NAME:=		busybox
 PKG_VERSION:=		1.13.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		6f86b4aa466f4b492c9468ba9500976a
-MASTER_SITES:=		http://www.busybox.net/downloads/
+PKG_DESCR:=		Core utilities for embedded Linux systems
+PKG_SECTION:=		base
+PKG_URL:=		http://www.busybox.net
+PKG_SITES:=		http://www.busybox.net/downloads/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-
-#rebuild:
-#	@rm $(WRKBUILD)/.configure_done
+$(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-configure:
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
@@ -56,14 +56,5 @@ ifeq ($(DEBUG),1)
 		$(IDIR_BUSYBOX)/bin/busybox
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
-	$(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d/
-	$(INSTALL_BIN) ./files/syslog.init \
-		$(IDIR_BUSYBOX)/etc/init.d/syslog
-	$(INSTALL_BIN) ./files/network.init \
-		$(IDIR_BUSYBOX)/etc/init.d/network
-	$(INSTALL_BIN) ./files/crond.init \
-		$(IDIR_BUSYBOX)/etc/init.d/crond
-	${INSTALL_BIN} files/inetd.init \
-		${IDIR_BUSYBOX}/etc/init.d/inetd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/ipkg/busybox.postinst b/package/busybox/files/busybox.postinst
index 97e83b766..97e83b766 100644
--- a/package/busybox/ipkg/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
diff --git a/package/busybox/files/crond.init b/package/busybox/files/crond.init
index c0b9da9e4..208479c6d 100644
--- a/package/busybox/files/crond.init
+++ b/package/busybox/files/crond.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG busybox
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init
index ad0527e6a..ff041aed4 100644
--- a/package/busybox/files/inetd.init
+++ b/package/busybox/files/inetd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 41
+#PKG busybox
+#INIT 41
 . /etc/rc.conf
 case $1 in
 autostart)
diff --git a/package/busybox/files/network.init b/package/busybox/files/network.init
index 0f3d4edad..ee70efcbf 100644
--- a/package/busybox/files/network.init
+++ b/package/busybox/files/network.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 40
+#PKG busybox
+#INIT 40
 . /etc/rc.conf
 case $1 in
 autostart)
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
index e06283480..9552dfe0a 100644
--- a/package/busybox/files/syslog.init
+++ b/package/busybox/files/syslog.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 05
+#PKG busybox
+#INIT 05
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/busybox/ipkg/busybox.control b/package/busybox/ipkg/busybox.control
deleted file mode 100644
index e7fc84a29..000000000
--- a/package/busybox/ipkg/busybox.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: busybox
-Priority: optional
-Section: net
-Description: Core utilities for embedded Linux systems
diff --git a/package/bwm/Makefile b/package/bwm/Makefile
index ebd8de30d..3a8972649 100644
--- a/package/bwm/Makefile
+++ b/package/bwm/Makefile
@@ -9,13 +9,16 @@ PKG_NAME:=		bwm
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		51021a036acb92d2bda0c0c0483f9552
+PKG_DESCR:=		A very tiny bandwidth monitor
+PKG_SECTION:=		net
+PKG_SITES:=		http://ftp.debian.org/debian/pool/main/b/bwm/
+
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
-MASTER_SITES:=		http://ftp.debian.org/debian/pool/main/b/bwm/
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}.orig
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-build:
 	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm
diff --git a/package/bwm/ipkg/bwm.control b/package/bwm/ipkg/bwm.control
deleted file mode 100644
index 4851a2deb..000000000
--- a/package/bwm/ipkg/bwm.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: bwm
-Priority: optional
-Section: net
-Description: A very tiny bandwidth monitor
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index ec6ee34bd..db4a582a4 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -9,14 +9,30 @@ PKG_NAME:=		cbtt
 PKG_VERSION:=		20060211
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		19abea2817c49ccc9438e9671c402984
+PKG_DESCR:=		Bittorrent tracker
+PKG_SECTION:=		net
+PKG_DEPENDS:=		zlib
+PKG_URL:=		http://bnbtusermods.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
+
+PKG_DESCR_1:=		Bittorrent tracker with mysql support
+PKG_DEPENDS_1:=		${PKG_DEPENDS} libmysqlclient
+
 DISTFILES:=		${PKG_NAME}80-${PKG_VERSION}-src.tar.gz
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
 WRKDIST=		${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
+PKG_DEPENDS+=		uclibc++
+PKG_DEPENDS_1+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+PKG_DEPENDS_1+=		libstdcxx
+endif
+
+$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
 BUILD_STYLE=		auto
 TLDFLAGS+=		-shared -L. -L${STAGING_DIR}/usr/lib/mysql \
diff --git a/package/cbtt/ipkg/cbtt-mysql.control b/package/cbtt/ipkg/cbtt-mysql.control
deleted file mode 100644
index ef8b52a32..000000000
--- a/package/cbtt/ipkg/cbtt-mysql.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cbtt-mysql
-Priority: optional
-Section: net
-Depends: zlib, libmysqlclient, uclibc++
-Description: Bittorrent tracker with mysql support
diff --git a/package/cbtt/ipkg/cbtt.control b/package/cbtt/ipkg/cbtt.control
deleted file mode 100644
index bc8b844ad..000000000
--- a/package/cbtt/ipkg/cbtt.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cbtt
-Priority: optional
-Section: net
-Depends: zlib, uclibc++
-Description: Bittorrent tracker
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index d99079195..4ab5c6ea1 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -8,12 +8,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		2
+PKG_DESCR:=		compressed config filesystem
+PKG_SECTION:=		base
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
 
diff --git a/package/cfgfs/ipkg/cfgfs.control b/package/cfgfs/ipkg/cfgfs.control
deleted file mode 100644
index 8ae5a7917..000000000
--- a/package/cfgfs/ipkg/cfgfs.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cfgfs
-Priority: optional
-Section: base
-Description: compressed config filesystem
-
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index 163aad53d..6b7cd9ecf 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		cgilib
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2c7053f58dfb06f7a80a112797ed7e86
-MASTER_SITES:=		http://www.infodrom.org/projects/cgilib/download/
+PKG_DESCR:=		Simple CGI Library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.infodrom.org/projects/cgilib
+PKG_SITES:=		http://www.infodrom.org/projects/cgilib/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CGILIB,cgilib,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE=		auto
diff --git a/package/cgilib/ipkg/cgilib.control b/package/cgilib/ipkg/cgilib.control
deleted file mode 100644
index eeed8be3a..000000000
--- a/package/cgilib/ipkg/cgilib.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: cgilib
-Priority: optional
-Section: libs
-Description: Simple CGI Library. 
- This library provides a simple programming API to the Common Gateway
- Interface (CGI).  It features HTTP Redirect, provides read access to
- FORM variables, sets HTTP Cookies and reads them.
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 367249294..65db0067a 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -9,23 +9,24 @@ PKG_NAME:=		chillispot
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		9d2597756af3fa14d7331b4a3651fc9b
-MASTER_SITES=		http://www.chillispot.info/download/
+PKG_DESCR:=		Wireless LAN Access Point Controller
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-tun
+PKG_URL:=		http://www.chillispot.info
+PKG_SITES=		http://www.chillispot.info/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CHILLISPOT}/etc/init.d
 	${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin
 	${INSTALL_BIN} ./files/chilli.conf \
 		${IDIR_CHILLISPOT}/etc/
-	${INSTALL_BIN} ./files/${PKG_NAME}.init \
-		${IDIR_CHILLISPOT}/etc/init.d/chilli
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/chillispot/ipkg/chillispot.conffiles b/package/chillispot/files/chillispot.conffiles
index 08485167d..08485167d 100644
--- a/package/chillispot/ipkg/chillispot.conffiles
+++ b/package/chillispot/files/chillispot.conffiles
diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init
index c2a6cd489..308668fca 100644
--- a/package/chillispot/files/chillispot.init
+++ b/package/chillispot/files/chillispot.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 70
+#PKG chillispot
+#INIT 70
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/chillispot/ipkg/chillispot.postinst b/package/chillispot/files/chillispot.postinst
index 20ad12d8c..20ad12d8c 100644
--- a/package/chillispot/ipkg/chillispot.postinst
+++ b/package/chillispot/files/chillispot.postinst
diff --git a/package/chillispot/ipkg/chillispot.control b/package/chillispot/ipkg/chillispot.control
deleted file mode 100644
index 0bb2badb8..000000000
--- a/package/chillispot/ipkg/chillispot.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: chillispot
-Priority: optional
-Section: net
-Depends: kmod-tun
-Description: ChilliSpot is a Wireless LAN Access Point Controller.
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 529e8cf68..2f9529bf5 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -6,14 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		4.6.2
+PKG_VERSION:=		4.7.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9eee46a6330780d6e6b41155b159f4f9
-MASTER_SITES:=		http://verplant.org/collectd/files/
+PKG_MD5SUM:=		b077e3398bd6fac0e53e9df4794db264
+PKG_DESCR:=		System statistics collection daemon
+PKG_SECTION:=		console
+PKG_DEPENDS:=		libpthread
+PKG_URL:=		http://collectd.org
+PKG_SITES:=		http://collectd.org/files/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifneq (${ADK_PACKAGE_COLLECTD_CPU},y)
 DISABLE_CPU:=--disable-cpu
@@ -43,9 +47,12 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-email \
 			--disable-entropy \
 			--disable-exec \
+			--disable-filecount \
+			--disable-fscache \
 			--disable-hddtemp \
 			--disable-interface \
 			--disable-iptables \
+			--disable-ipvs \
 			--disable-irq \
 			${DISABLE_LOAD} \
 			--disable-mbmon \
@@ -53,6 +60,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			${DISABLE_MEMORY} \
 			--disable-multimeter \
 			--disable-mysql \
+			--disable-openvpn \
 			--disable-postgresql \
 			--disable-powerdns \
 			--disable-network \
@@ -69,7 +77,11 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-swap \
 			--disable-syslog \
 			--disable-tape \
+			--disable-target_notification \
+			--disable-target_replace \
+			--disable-target_set \
 			--disable-teamspeak2 \
+			--disable-ted \
 			--disable-thermal \
 			--disable-unixsock \
 			--disable-users \
@@ -83,11 +95,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_COLLECTD}/etc/init.d
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd
-	${INSTALL_BIN} ./files/collectd.init \
-		${IDIR_COLLECTD}/etc/init.d/collectd
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
 	${CP} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
 	${CP} ${WRKINST}/usr/lib/collectd/*.so ${IDIR_COLLECTD}/usr/lib/collectd/
 
diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init
index 7d4f70b59..601dd53d4 100644
--- a/package/collectd/files/collectd.init
+++ b/package/collectd/files/collectd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 75
+#PKG collectd
+#INIT 75
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/collectd/ipkg/collectd.postinst b/package/collectd/files/collectd.postinst
index 7e4416125..7e4416125 100644
--- a/package/collectd/ipkg/collectd.postinst
+++ b/package/collectd/files/collectd.postinst
diff --git a/package/collectd/ipkg/collectd.control b/package/collectd/ipkg/collectd.control
deleted file mode 100644
index 790e0fdfb..000000000
--- a/package/collectd/ipkg/collectd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: collectd
-Priority: optional
-Section: console
-Description: System statistics collection daemon
-Depends: libpthread
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d563de441..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- collectd-4.6.2.orig/src/Makefile.in	2009-03-18 11:56:40.000000000 +0100
-+++ collectd-4.6.2/src/Makefile.in	2009-05-09 16:28:02.000000000 +0200
-@@ -1340,7 +1340,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \
- 	$(am__append_3)
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
- 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- 	-DLOCALSTATEDIR='"${localstatedir}"' \
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index d9cd54f7d..06ff87f58 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -9,20 +9,23 @@ PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
+PKG_DESCR:=		Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool
+PKG_SECTION:=		console
+PKG_URL:=		http://sourceforge.net/projects/comgt
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=comgt/}
+
 DISTFILES:=		${PKG_NAME}.${PKG_VERSION}.tgz
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=comgt/}
 WRKDIST=		${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=		auto
 ALL_TARGET=		comgt
 
 do-install:
-	${INSTALL_DIR} ${IDIR_COMGT}/usr/bin
-	${INSTALL_DIR} ${IDIR_COMGT}/etc/comgt
+	${INSTALL_DIR} ${IDIR_COMGT}/usr/bin ${IDIR_COMGT}/etc/comgt
 	${INSTALL_BIN} ${WRKBUILD}/comgt ${IDIR_COMGT}/usr/bin/comgt
 	${INSTALL_DATA} ./files/dial.comgt ${IDIR_COMGT}/etc/comgt/dial.comgt
 
diff --git a/package/comgt/ipkg/comgt.control b/package/comgt/ipkg/comgt.control
deleted file mode 100644
index fe2c1cd61..000000000
--- a/package/comgt/ipkg/comgt.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: comgt
-Priority: optional
-Section: console
-Description: Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index 9438a34c7..e84953a6c 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -9,7 +9,7 @@ PKG_NAME:=		compositeproto
 PKG_VERSION:=		0.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		33a79f6ba950bc5b41e077c951871bd5
-MASTER_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 18bf00756..58c2c4ce3 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		cryptsetup
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		00d452eb7a76e39f5749545d48934a10
+PKG_DESCR:=		LUKS cryptsetup tools
+PKG_SECTION:=		crypto
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
+PKG_URL:=		http://cryptsetup.googlecode.com
+PKG_SITES:=		http://cryptsetup.googlecode.com/files/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-MASTER_SITES:=		http://cryptsetup.googlecode.com/files/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CRYPTSETUP,cryptsetup,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-static
@@ -22,8 +27,7 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin
-	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/lib
+	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \
 		${IDIR_CRYPTSETUP}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \
diff --git a/package/cryptsetup/ipkg/cryptsetup.control b/package/cryptsetup/ipkg/cryptsetup.control
deleted file mode 100644
index f23b5bf4d..000000000
--- a/package/cryptsetup/ipkg/cryptsetup.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cryptsetup
-Priority: optional
-Section: crypto
-Depends: libgcrypt, device-mapper, libuuid, libpopt
-Description: LUKS cryptsetup tools
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index c9cf60739..44436bb7f 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -9,17 +9,22 @@ PKG_NAME:=		ctorrent
 PKG_VERSION:=		1.3.4-dnh2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		6635e2d0d0ee21faeb85d95cd93c137b
-MASTER_SITES:=		http://www.rahul.net/dholmes/ctorrent/
+PKG_DESCR:=		console-based BitTorrent client
+PKG_SECTION:=		net
+PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
+PKG_SITES:=		http://www.rahul.net/dholmes/ctorrent/
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-dnh2
+
 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-PKG_DEPEND:=            uclibc++
+PKG_DEPENDS:=            uclibc++
 else
-PKG_DEPEND:=            libstdcxx
+PKG_DEPENDS:=            libstdcxx
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEND}))
+$(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
diff --git a/package/ctorrent/ipkg/ctorrent.control b/package/ctorrent/ipkg/ctorrent.control
deleted file mode 100644
index 0b7d1d59e..000000000
--- a/package/ctorrent/ipkg/ctorrent.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: ctorrent
-Priority: optional
-Section: net
-Description: console-based BitTorrent client
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 9bb75ffa1..d17d58cda 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -9,13 +9,18 @@ PKG_NAME:=		cups
 PKG_VERSION:=		1.3.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		84fffe96b8537c81a463faccead80026
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
-MASTER_SITES:=		http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \
+PKG_DESCR:=		Common Unix Printing System
+PKG_SECTION:=		net
+PKG_DEPENDS:=		zlib libpthread
+PKG_URL:=		http://www.cups.org
+PKG_SITES:=		http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \
 			ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
@@ -43,7 +48,6 @@ FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
 XAKE_FLAGS+=		OPTIM=''
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CUPS}/etc/init.d
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/share/doc/cups
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/bin
 	${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin
@@ -71,7 +75,5 @@ post-install:
 		${IDIR_CUPS}/usr/share/cups/templates/
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
-	${INSTALL_BIN} ./files/cupsd.init \
-		${IDIR_CUPS}/etc/init.d/cupsd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/ipkg/cups.conffiles b/package/cups/files/cups.conffiles
index bed6faa3f..bed6faa3f 100644
--- a/package/cups/ipkg/cups.conffiles
+++ b/package/cups/files/cups.conffiles
diff --git a/package/cups/ipkg/cups.postinst b/package/cups/files/cups.postinst
index fa191bee7..fa191bee7 100644
--- a/package/cups/ipkg/cups.postinst
+++ b/package/cups/files/cups.postinst
diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init
index d22f55c96..03be3300f 100644
--- a/package/cups/files/cupsd.init
+++ b/package/cups/files/cupsd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG cups
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/cups/ipkg/cups.control b/package/cups/ipkg/cups.control
deleted file mode 100644
index de3d14250..000000000
--- a/package/cups/ipkg/cups.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cups
-Priority: optional
-Section: net
-Depends: zlib, libpthread
-Description: Common Unix Printing System
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 192a3f27b..82e07c8f0 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -9,7 +9,10 @@ PKG_NAME:=		curl
 PKG_VERSION:=		7.19.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		35f51ac7bcff689b2d2d6e38a3c4d1ae
-MASTER_SITES:=		http://curl.haxx.se/download/ \
+PKG_DESCR:=		a client-side URL transfer tool
+PKG_SECTION:=		net
+PKG_URL:=		http://curl.haxx.se
+PKG_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrorspace.org/curl/ \
 			http://curl.mirror.internet.tp/download/ \
 			ftp://ftp.sunet.se/pub/www/utilities/curl/ \
@@ -17,12 +20,17 @@ MASTER_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrormonster.com/curl/download/ \
 			http://curl.mirrors.cyberservers.net/download/
 
+PKG_DESCR_1:=		a client-side URL transfer library
+PKG_SECTION_1:=		libs
+PKG_DEPENDS_1:=		libopenssl zlib
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
 
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
 			--enable-crypto-auth \
@@ -47,9 +55,8 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_CURL}/usr/bin
+	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
-	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/curl/ipkg/curl.control b/package/curl/ipkg/curl.control
deleted file mode 100644
index 2678e0430..000000000
--- a/package/curl/ipkg/curl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: curl
-Priority: optional
-Section: net
-Description: a client-side URL transfer tool
-Depends: libcurl
diff --git a/package/curl/ipkg/libcurl.control b/package/curl/ipkg/libcurl.control
deleted file mode 100644
index 435a3192a..000000000
--- a/package/curl/ipkg/libcurl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libcurl
-Priority: optional
-Section: libs
-Description: a client-side URL transfer library
-Depends: libopenssl, zlib
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index e83cc41c8..79660c005 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -9,15 +9,19 @@ PKG_NAME:=		cutter
 PKG_VERSION:=		1.03
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		50093db9b64277643969ee75b83ebbd1
+PKG_DESCR:=		Abort TCP/IP connections routed over a firewall
+PKG_SECTION:=		net
+PKG_URL:=		http://www.lowth.com/cutter/software/
+PKG_SITES:=		http://www.lowth.com/cutter/software/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-MASTER_SITES:=		http://www.lowth.com/cutter/software/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-build:
-	${TARGET_CC} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
+	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CUTTER}/usr/sbin
diff --git a/package/cutter/ipkg/cutter.control b/package/cutter/ipkg/cutter.control
deleted file mode 100644
index 6c9169222..000000000
--- a/package/cutter/ipkg/cutter.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: cutter
-Architecture: mipsel
-Section: net
-Description: "Cutter" is an open source program that allows Linux firewall administrators to abort TCP/IP connections routed over the firewall or router on which it is run.
-Priority: optional
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 8458b7729..392581ce8 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -9,19 +9,27 @@ PKG_NAME:=		cxxtools
 PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		16ce92a83beb925fa5138fc9a52d55af
-MASTER_SITES:=		http://www.tntnet.org/download/
+PKG_DESCR:=		a collection of general-purpose C++ classes
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libiconv
+PKG_URL:=		http://www.tntnet.org
+PKG_SITES:=		http://www.tntnet.org/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,CXXTOOLS,cxxtools,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+PKG_DEPENDS+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+endif
+
+$(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 TCXXFLAGS+=		-fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
 TLDFLAGS+=		-luClibc++ -liconv -lm -nodefaultlibs 
-DEPENDS=		"libgcc, uclibc++, libiconv"
 else
 TLDFLAGS+=		-liconv -shared
-DEPENDS=		"libgcc, libiconv, libstdcxx"
 endif
 
 CONFIGURE_STYLE:=	gnu
@@ -39,6 +47,5 @@ endif
 post-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/
-	echo Depends: ${DEPENDS} >>${IDIR_CXXTOOLS}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cxxtools/ipkg/cxxtools.control b/package/cxxtools/ipkg/cxxtools.control
deleted file mode 100644
index 130236235..000000000
--- a/package/cxxtools/ipkg/cxxtools.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: cxxtools
-Priority: optional
-Section: net
-Description: cxxtools
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 64322c771..bce77f2dc 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		45dde9d19193ae9dd388eb68b2027bc9
-MASTER_SITES:=		http://ftp.andrew.cmu.edu/pub/cyrus-mail/
+PKG_DESCR:=		a general purpose authentication library
+PKG_SECTION:=		libs
+PKG_URL:=		http://asg.web.cmu.edu/sasl
+PKG_SITES:=		http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-sample \
diff --git a/package/cyrus-sasl/ipkg/libsasl2.control b/package/cyrus-sasl/ipkg/libsasl2.control
deleted file mode 100644
index 82e0f0a48..000000000
--- a/package/cyrus-sasl/ipkg/libsasl2.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libsasl2
-Priority: optional
-Section: libs
-Description: a general purpose authentication library
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 6b7f45e7a..4ffd21ea1 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -9,7 +9,7 @@ PKG_NAME:=		damageproto
 PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		bce4477a6edd774dfca175ea46e1ba76
-MASTER_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 4e90b1a05..d84ae0f1b 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -9,11 +9,22 @@ PKG_NAME=		davfs2
 PKG_VERSION=		1.3.3
 PKG_RELEASE=		1
 PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
+PKG_DESCR:=		WebDAV filesystem
+PKG_SECTION:=		admin
+PKG_URL:=		http://savannah.nongnu.org/projects/davfs2
+PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
+PKG_DEPENDS:=			fuse-utils, kmod-fuse, libfuse, libiconv, neon
+else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
+PKG_DEPENDS:=			kmod-fs-coda, libiconv, neon
+else
+PKG_DEPENDS:=			kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon
+endif
+
+$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-neon
@@ -21,14 +32,6 @@ CONFIGURE_ENV+=		LIBS=-liconv
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
-ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-DEPS=			fuse-utils, kmod-fuse, libfuse, libiconv, neon
-else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
-DEPS=			kmod-fs-coda, libiconv, neon
-else
-DEPS=			kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon
-endif
-
 post-install:
 	${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2
 	${INSTALL_DIR} ${IDIR_DAVFS2}/usr/sbin
@@ -38,6 +41,5 @@ post-install:
 		${IDIR_DAVFS2}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/umount.davfs \
 		${IDIR_DAVFS2}/usr/sbin
-	echo 'Depends: ${DEPS}' >>${IDIR_DAVFS2}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/davfs2/ipkg/davfs2.conffiles b/package/davfs2/files/davfs2.conffiles
index c831d9d59..c831d9d59 100644
--- a/package/davfs2/ipkg/davfs2.conffiles
+++ b/package/davfs2/files/davfs2.conffiles
diff --git a/package/davfs2/ipkg/davfs2.postinst b/package/davfs2/files/davfs2.postinst
index 1d333c4a6..1d333c4a6 100644
--- a/package/davfs2/ipkg/davfs2.postinst
+++ b/package/davfs2/files/davfs2.postinst
diff --git a/package/davfs2/ipkg/davfs2.control b/package/davfs2/ipkg/davfs2.control
deleted file mode 100644
index 87d85e9df..000000000
--- a/package/davfs2/ipkg/davfs2.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: davfs2
-Priority: optional
-Section: admin
-Description: WebDAV filesystem
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index ec8b29777..b240bc043 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -6,14 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.0.2
-PKG_RELEASE:=		7
-PKG_MD5SUM:=		0552a9b54beb4a044951b7cdbc8fc855
-MASTER_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+PKG_VERSION:=		1.0.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ce328423db5743fe9006d39113b5324d
+PKG_DESCR:=		DBUS library
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libexpat
+PKG_URL:=		http://dbus.freedesktop.org
+PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-tests \
@@ -30,9 +34,7 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		confprog auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc
-	${INSTALL_DIR} ${IDIR_DBUS}/usr/lib
-	${INSTALL_DIR} ${IDIR_DBUS}/usr/bin
+	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin
 	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
@@ -40,8 +42,5 @@ post-install:
 		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
-	${INSTALL_DIR} ${IDIR_DBUS}/etc/init.d
-	${INSTALL_BIN} ./files/dbus.init \
-		${IDIR_DBUS}/etc/init.d/dbus
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index dd1761271..3484c4522 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG dbus
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/dbus/ipkg/dbus.postinst b/package/dbus/files/dbus.postinst
index 8dd0a50c8..8dd0a50c8 100644
--- a/package/dbus/ipkg/dbus.postinst
+++ b/package/dbus/files/dbus.postinst
diff --git a/package/dbus/ipkg/dbus.control b/package/dbus/ipkg/dbus.control
deleted file mode 100644
index d1cecbd8a..000000000
--- a/package/dbus/ipkg/dbus.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dbus
-Priority: optional
-Section: net
-Description: DBUS library
-Depends: libexpat
diff --git a/package/deco/Makefile b/package/deco/Makefile
index b6717db64..3611bb8a6 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -9,20 +9,23 @@ PKG_NAME:=		deco
 PKG_VERSION:=		39
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
+PKG_DESCR:=		Text-based, full featured file manager
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		libncurses
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=deco/}
+
 DISTFILES:=		${PKG_NAME}${PKG_VERSION}.tgz
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=deco/}
 WRKDIST=		${WRKDIR}/${PKG_NAME}${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
 
 do-install:
-	${INSTALL_DIR} ${IDIR_DECO}/usr/bin
-	${INSTALL_DIR} ${IDIR_DECO}/usr/lib/deco
+	${INSTALL_DIR} ${IDIR_DECO}/usr/bin ${IDIR_DECO}/usr/lib/deco
 	${INSTALL_BIN} ${WRKBUILD}/deco ${IDIR_DECO}/usr/bin/deco
 	${INSTALL_DATA} ${WRKBUILD}/profile ${IDIR_DECO}/usr/lib/deco/profile
 	${INSTALL_DATA} ${WRKBUILD}/menu ${IDIR_DECO}/usr/lib/deco/menu
diff --git a/package/deco/ipkg/deco.control b/package/deco/ipkg/deco.control
deleted file mode 100644
index f7e8c4348..000000000
--- a/package/deco/ipkg/deco.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: deco
-Priority: optional
-Section: misc
-Depends: libncurses
-Description: Text-based, full featured file manager
diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile
index 38b738ca3..b0e48e7a9 100644
--- a/package/device-mapper/Makefile
+++ b/package/device-mapper/Makefile
@@ -9,20 +9,17 @@ PKG_NAME:=		device-mapper
 PKG_VERSION:=		1.02.28
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c9ae0776994a419f9e1ba842164bb626
-DISTFILES:=		${PKG_NAME}.${PKG_VERSION}.tgz
-MASTER_SITES:=		ftp://sources.redhat.com/pub/dm/
+PKG_DESCR:=		device mapper tools and libraries
+PKG_SECTION:=		utils
+PKG_URL:=		http://sources.redhat.com/dm
+PKG_SITES:=		ftp://sources.redhat.com/pub/dm/
 
+DISTFILES:=		${PKG_NAME}.${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}.${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE}))
-
-ifeq ($(DEBUG),1)
-CONFIGURE_ARGS+=	--enable-debug
-else
-CONFIGURE_ARGS+=	--disable-debug
-endif
+$(eval $(call PKG_template,DEVICE_MAPPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
@@ -33,8 +30,7 @@ INSTALL_STYLE:=		auto
 INSTALL_TARGET+=	install_static_lib
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
-	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/lib
+	${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
 		${IDIR_DEVICE_MAPPER}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
diff --git a/package/device-mapper/ipkg/device-mapper.control b/package/device-mapper/ipkg/device-mapper.control
deleted file mode 100644
index cb6cddad9..000000000
--- a/package/device-mapper/ipkg/device-mapper.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: device-mapper
-Priority: optional
-Section: utils
-Description: device mapper tools and libs
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index e0aa1dc6a..02d6b2ca5 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -6,30 +6,30 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp-forwarder
-PKG_VERSION:=		0.7
-PKG_RELEASE:=		12
-PKG_MD5SUM:=		e7f876e615ebc3f96418f6477b4451e2
+PKG_VERSION:=		0.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fb3670dee9f71af1e55ac5dcd64e213e
+PKG_DESCR:=		DHCP relay agent
+PKG_SECTION:=		net
+PKG_URL:=		http://www.nongnu.org/dhcp-fwd
+PKG_SITES:=		http://savannah.nongnu.org/download/dhcp-fwd/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-MASTER_SITES:=		http://savannah.nongnu.org/download/dhcp-fwd/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull="yes"
 CONFIGURE_ARGS+=	--disable-dietlibc
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 XAKE_FLAGS+=		cfg_filename="/etc/dhcp-fwd.conf"
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/etc/init.d
-	${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin
+	${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin ${IDIR_DHCP_FORWARDER}/etc
 	${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \
 		${IDIR_DHCP_FORWARDER}/etc/
-	${INSTALL_BIN} ./files/dhcp-fwd.init \
-		${IDIR_DHCP_FORWARDER}/etc/init.d/dhcp-fwd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcp-fwd \
 		${IDIR_DHCP_FORWARDER}/usr/sbin/
 
diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles b/package/dhcp-forwarder/files/dhcp-forwarder.conffiles
index 70be85a8a..70be85a8a 100644
--- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.conffiles
+++ b/package/dhcp-forwarder/files/dhcp-forwarder.conffiles
diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
index 9ba16f5b0..9ba16f5b0 100644
--- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.postinst
+++ b/package/dhcp-forwarder/files/dhcp-forwarder.postinst
diff --git a/package/dhcp-forwarder/files/dhcp-fwd.init b/package/dhcp-forwarder/files/dhcp-fwd.init
index 1481095fe..70d499aba 100644
--- a/package/dhcp-forwarder/files/dhcp-fwd.init
+++ b/package/dhcp-forwarder/files/dhcp-fwd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG dhcp-forwarder
+#INIT 80
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/dhcp-forwarder/ipkg/dhcp-forwarder.control b/package/dhcp-forwarder/ipkg/dhcp-forwarder.control
deleted file mode 100644
index 9958ddb39..000000000
--- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dhcp-forwarder
-Priority: optional
-Section: net
-Description: a DHCP relay agent
diff --git a/package/dhcp-forwarder/patches/00-big_endian.patch b/package/dhcp-forwarder/patches/00-big_endian.patch
deleted file mode 100644
index add157d3f..000000000
--- a/package/dhcp-forwarder/patches/00-big_endian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dhcp-forwarder-0.7/src/dhcp.h	2004-06-22 03:46:56.000000000 -0700
-+++ dhcp-forwarder-0.7-x/src/dhcp.h	2005-10-06 17:04:14.000000000 -0700
-@@ -89,7 +89,7 @@
-   optDHCP_COOKIE = 0x63538263u,
-   flgDHCP_BCAST	 = 0x0080u
- #else
--  DHCP_COOKIE  	 = 0x63825363u,
-+  optDHCP_COOKIE = 0x63825363u,
-   flgDHCP_BCAST	 = 0x8000u
- #endif
- };
diff --git a/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch b/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch
deleted file mode 100644
index ef8491330..000000000
--- a/package/dhcp-forwarder/patches/01-getpwnmam_getgrnam.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -pur dhcp-forwarder-0.7-orig/src/wrappers.h dhcp-forwarder-0.7-patched/src/wrappers.h
---- dhcp-forwarder-0.7-orig/src/wrappers.h	2004-06-22 12:46:56.000000000 +0200
-+++ dhcp-forwarder-0.7-patched/src/wrappers.h	2005-12-27 12:28:10.464289435 +0100
-@@ -65,7 +65,14 @@ Egetgrnam(char const *name)
-    /*@*/
- {
-   /*@observer@*/struct group const	*res = getgrnam(name);
--  FatalErrnoError(res==0, 1, "getgrnam()");
-+
-+  FatalErrnoError((res == NULL) && (errno != 0), 1, "getgrnam()");
-+
-+  if (res == NULL)
-+  {
-+    fprintf (stderr, "No such group: `%s'\n", name);
-+    exit (1);
-+  }
- 
-     /*@-freshtrans@*/
-     /*@-mustfreefresh@*/
-@@ -80,7 +87,14 @@ Egetpwnam(char const *name)
-     /*@*/
- {
-   struct passwd const	*res = getpwnam(name);
--  FatalErrnoError(res==0, 1, "getpwnam()");
-+
-+  FatalErrnoError((res == NULL) && (errno != 0), 1, "getpwnam()");
-+
-+  if (res == NULL)
-+  {
-+    fprintf (stderr, "No such user: `%s'\n", name);
-+    exit (1);
-+  }
- 
-   return res;
- }
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index 37d2aa7b6..42fbf67f0 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,5 +1,3 @@
-#menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation"
-
 config ADK_COMPILE_DHCP
 	tristate
 	default n
@@ -13,7 +11,6 @@ config ADK_PACKAGE_DHCP_RELAY
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
 	  Protocol) relay daemon.
-
 	  http://www.isc.org/
 
 config ADK_PACKAGE_DHCP_SERVER
@@ -24,7 +21,4 @@ config ADK_PACKAGE_DHCP_SERVER
 	help
 	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
 	  Protocol) server daemon.
-
 	  http://www.isc.org/
-
-#endmenu
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index de038d81b..adaa35c17 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		dhcp
 PKG_VERSION:=		3.0.7
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		426bfa1712ababaff4be6dadee9c1982
-MASTER_SITES:=		ftp://ftp.isc.org/isc/dhcp/
+PKG_DESCR:=		ISC DHCP server
+PKG_SECTION:=		net
+PKG_URL:=		https://www.isc.org/software/dhcp
+PKG_SITES:=		ftp://ftp.isc.org/isc/dhcp/
+
+PKG_DESCR_1:=		ISC DHCP relay server
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 do-configure:
 	(cd ${WRKBUILD} ; \
@@ -27,11 +32,8 @@ INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc/init.d
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin
-	${INSTALL_BIN} ./files/dhcpd.init \
-		${IDIR_DHCP_SERVER}/etc/init.d/dhcpd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd ${IDIR_DHCP_SERVER}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcp/ipkg/dhcp-server.postinst b/package/dhcp/files/dhcp-server.postinst
index 592120cdc..592120cdc 100644
--- a/package/dhcp/ipkg/dhcp-server.postinst
+++ b/package/dhcp/files/dhcp-server.postinst
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index 31c182948..6ba76df9f 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG dhcp-server
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/dhcp/ipkg/dhcp-relay.control b/package/dhcp/ipkg/dhcp-relay.control
deleted file mode 100644
index fbd3d20b8..000000000
--- a/package/dhcp/ipkg/dhcp-relay.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dhcp-relay
-Priority: optional
-Section: net
-Description: ISC DHCP relay
diff --git a/package/dhcp/ipkg/dhcp-server.control b/package/dhcp/ipkg/dhcp-server.control
deleted file mode 100644
index a9b86a183..000000000
--- a/package/dhcp/ipkg/dhcp-server.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dhcp-server
-Priority: optional
-Section: net
-Description: ISC DHCP server
diff --git a/package/dhcp6/Config.in b/package/dhcp6/Config.in
deleted file mode 100644
index cbb5bccc4..000000000
--- a/package/dhcp6/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_DHCP6
-	prompt "dhcp6............................. IPv6 DHCP server and client"
-	depends on ADK_IPV6
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-		This is the first ever open source implementation of Dynamic
-		Host Configuration Protocol for IPv6 (DHCPv6) server and client
-		on Linux Operating System. The server provides leases
-		(durations or lifetimes) on IPv6 addresses to the clients who
-		request for it
diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile
deleted file mode 100644
index 58f305bc4..000000000
--- a/package/dhcp6/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id$
-#-
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		dhcp6
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		86193dfa62137db3ea459543db4f1102
-DISTFILES:=		dhcpv6-linux-${PKG_VERSION}.zip
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=dhcpv6-linux/}
-WRKDIST=		${WRKDIR}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,DHCP6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
-
-do-build:
-	${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/server
-	${MAKE} CC="${TARGET_CC}" STAGING_DIR=${STAGING_DIR} -C ${WRKBUILD}/client
-
-do-install:
-	${INSTALL_DIR} ${IDIR_DHCP6}/usr/sbin
-	${INSTALL_DIR} ${IDIR_DHCP6}/etc/dhcp{d6,6}
-	${INSTALL_BIN} ${WRKBUILD}/client/cli ${IDIR_DHCP6}/usr/sbin/dhcp6client
-	${INSTALL_BIN} ${WRKBUILD}/server/serv ${IDIR_DHCP6}/usr/sbin/dhcpd6
-	${CP} ${WRKBUILD}/server/*.conf ${IDIR_DHCP6}/etc/dhcpd6/
-	${CP} ${WRKBUILD}/client/*.conf ${IDIR_DHCP6}/etc/dhcp6/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcp6/ipkg/dhcp6.control b/package/dhcp6/ipkg/dhcp6.control
deleted file mode 100755
index cc030a0e2..000000000
--- a/package/dhcp6/ipkg/dhcp6.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dhcp6
-Section: net
-Architecture: mipsel
-Priority: optional
-Description: This is the first ever open source implementation of Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server and client on Linux Operating System. The server provides leases (durations or lifetimes) on IPv6 addresses to the clients who request for it. 
diff --git a/package/dhcp6/patches/patch-client_Makefile b/package/dhcp6/patches/patch-client_Makefile
deleted file mode 100644
index 6004a355b..000000000
--- a/package/dhcp6/patches/patch-client_Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-$Id$
---- w-dhcp6-1.0-1.orig/client/Makefile	2025-06-28 23:21:40.000000000 +0200
-+++ w-dhcp6-1.0-1/client/Makefile	2008-10-20 13:29:40.000000000 +0200
-@@ -1,42 +1,40 @@
--
--CC = gcc
- STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h states.h timer_val.h constants.h macros.h status_codes.h
- OBJECT_FILES = client.o solicit.o clilib.o parse.o request.o decline.o renew.o rebind.o release.o
- HEADER_FILES = solicit.h clilib.h parse.h request.h decline.h renew.h rebind.h release.h
--
-+IFLAGS = -I$(STAGING_DIR)/usr/include
- 
- dhcpv6_client : dhcpv6_client.c cli
--	$(CC) -g3 dhcpv6_client.c -o dhcpv6_client
-+	$(CC) $(IFLAGS) dhcpv6_client.c -o dhcpv6_client
- 
- cli : $(OBJECT_FILES)
--	$(CC) -g3 $(OBJECT_FILES) -o cli -lncurses
-+	$(CC) $(IFLAGS) $(OBJECT_FILES) -o cli -L$(STAGING_DIR)/usr/lib -lncurses
- 
- client.o : client.c $(STD_HEADERS) $(HEADER_FILES)
--	$(CC) -g3 -c client.c -o client.o
-+	$(CC) $(IFLAGS) -c client.c -o client.o
- 
- release.o : release.c release.h clilib.h
--	$(CC) -g3 -c release.c -o release.o
-+	$(CC) $(IFLAGS) -c release.c -o release.o
- 
- rebind.o : rebind.c rebind.h clilib.h
--	$(CC) -g3 -c rebind.c -o rebind.o
-+	$(CC)  $(IFLAGS) -c rebind.c -o rebind.o
- 
- renew.o : renew.c renew.h clilib.h
--	$(CC) -g3 -c renew.c -o renew.o
-+	$(CC) $(IFLAGS) -c renew.c -o renew.o
- 
- request.o : request.c request.h clilib.h
--	$(CC) -g3 -c request.c -o request.o
-+	$(CC) $(IFLAGS) -c request.c -o request.o
- 
- decline.o : decline.c decline.h clilib.h parse.h solicit.h
--	$(CC) -g3 -c decline.c -o decline.o
-+	$(CC) $(IFLAGS) -c decline.c -o decline.o
- 
- solicit.o : solicit.c solicit.h clilib.h parse.h
--	$(CC) -g3 -c solicit.c -o solicit.o
-+	$(CC) $(IFLAGS) -c solicit.c -o solicit.o
- 
- clilib.o : clilib.c clilib.h parse.h
--	$(CC) -g3 -c clilib.c -o clilib.o
-+	$(CC) $(IFLAGS) -c clilib.c -o clilib.o
- 
- parse.o : parse.c parse.h clilib.h
--	$(CC) -g3 -c parse.c -o parse.o
-+	$(CC) $(IFLAGS) -c parse.c -o parse.o
- 
- clean :
- 	rm -f *.o cli dhcpv6_client
diff --git a/package/dhcp6/patches/patch-client_clilib_c b/package/dhcp6/patches/patch-client_clilib_c
deleted file mode 100644
index a9f416fa6..000000000
--- a/package/dhcp6/patches/patch-client_clilib_c
+++ /dev/null
@@ -1,22 +0,0 @@
-$Id$
---- w-dhcp6-1.0-1.orig/client/clilib.c	Sat Jun 28 23:21:17 2025
-+++ w-dhcp6-1.0-1/client/clilib.c	Tue Jul 25 10:37:06 2006
-@@ -554,7 +554,7 @@ u_int8_t convert_character_to_hex (char 
- 
- void generate_trans_id (u_int32_t *trans_id)
- {
--    extern u_int32_t g_trans_id;
-+    extern int g_trans_id;
-     time_t t;
-     srand (time (&t));
-     *trans_id = 0;
-@@ -890,9 +890,7 @@ void read_option (char *m, int index, in
- 		    break;
- 
- 		default :
--#if DEBUG == 3
- 		    printf ("Unrecognized DUID type\n");
--#endif
- 	    }
- 
- 	    next_opt = (struct OPTIONS *) malloc (sizeof (struct OPTIONS));
diff --git a/package/dhcp6/patches/patch-client_macros_h b/package/dhcp6/patches/patch-client_macros_h
deleted file mode 100644
index f918cd5fd..000000000
--- a/package/dhcp6/patches/patch-client_macros_h
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- w-dhcp6-1.0-1.orig/client/macros.h	2025-06-28 23:21:40.000000000 +0200
-+++ w-dhcp6-1.0-1/client/macros.h	2008-10-20 15:31:08.000000000 +0200
-@@ -1,5 +1,5 @@
- #define INITIALIZE_SOCKADDR(x){                                  \
--  bzero((char *) &(x), sizeof((x)));                             \
-+  memset((char *) &(x), 0, sizeof((x)));                         \
-   (x).sin6_family   = AF_INET6;                                  \
-   (x).sin6_flowinfo = htonl(0);                                  \
-   (x).sin6_scope_id = 0;                                         \
diff --git a/package/dhcp6/patches/patch-client_solicit_c b/package/dhcp6/patches/patch-client_solicit_c
deleted file mode 100644
index 7214598f0..000000000
--- a/package/dhcp6/patches/patch-client_solicit_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- w-dhcp6-1.0-1.orig/client/solicit.c	Sat Jun 28 23:21:17 2025
-+++ w-dhcp6-1.0-1/client/solicit.c	Tue Jul 25 10:37:07 2006
-@@ -18,7 +18,7 @@ struct DHCP_MESSAGE * create_solicit_mes
-     dhcp_message_ptr -> opt = add_client_id_option (interface_details);
-     
-     opt_ptr = (struct OPTIONS *) dhcp_message_ptr -> opt;
--    (struct OPTIONS *) ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details);
-+    ((struct DUID *) opt_ptr -> opt_data) -> opt = add_ia_option (interface_details);
-     return dhcp_message_ptr;
- }
- 
diff --git a/package/dhcp6/patches/patch-server_Makefile b/package/dhcp6/patches/patch-server_Makefile
deleted file mode 100644
index 0ae2e4825..000000000
--- a/package/dhcp6/patches/patch-server_Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-$Id$
---- w-dhcp6-1.0-1.orig/server/Makefile	Fri Jun 28 14:49:42 2002
-+++ w-dhcp6-1.0-1/server/Makefile	Tue Jul 25 10:37:06 2006
-@@ -1,27 +1,26 @@
--CC = gcc
- STD_HEADERS = stdhead.h head.h struct.h options_type.h message_type.h macros.h status_codes.h constants.h
- OBJECT_FILES = server.o lib.o advertise.o parse.o leases.o reply.o
- 
- serv: $(OBJECT_FILES)
--	$(CC) -g3 $(OBJECT_FILES) -o serv
-+	$(CC) $(OBJECT_FILES) -o serv
- 
- lib.o: lib.c lib.h $(STD_HEADERS)
--	$(CC) -g3 -c lib.c -o lib.o
-+	$(CC) -c lib.c -o lib.o
- 
- parse.o: parse.c parse.h $(STD_HEADERS)
--	$(CC) -g3 -c parse.c -o parse.o
-+	$(CC) -c parse.c -o parse.o
- 
- leases.o: leases.c leases.h $(STD_HEADERS)
--	$(CC) -g3 -c leases.c -o leases.o
-+	$(CC) -c leases.c -o leases.o
- 
- advertise.o: advertise.c advertise.h $(STD_HEADERS)
--	$(CC) -g3 -c advertise.c -o advertise.o
-+	$(CC) -c advertise.c -o advertise.o
- 
- reply.o: reply.c reply.h $(STD_HEADERS)
--	$(CC) -g3 -c reply.c -o reply.o
-+	$(CC) -c reply.c -o reply.o
- 
- server.o: server.c lib.h advertise.h reply.h leases.h parse.h $(STD_HEADERS)
--	$(CC) -g3 -c server.c -o server.o
-+	$(CC) -c server.c -o server.o
- 
- clean: 
- 	rm -f *.o serv
diff --git a/package/dhcp6/patches/patch-server_macros_h b/package/dhcp6/patches/patch-server_macros_h
deleted file mode 100644
index 916e4c798..000000000
--- a/package/dhcp6/patches/patch-server_macros_h
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- w-dhcp6-1.0-1.orig/server/macros.h	2002-06-28 14:50:04.000000000 +0200
-+++ w-dhcp6-1.0-1/server/macros.h	2008-10-20 15:30:53.000000000 +0200
-@@ -1,5 +1,5 @@
- #define INITIALIZE_SOCKADDR(x){                                  \
--  bzero((char *) &(x), sizeof((x)));                             \
-+  memset((char *) &(x), 0, sizeof((x)));                         \
-   (x).sin6_family   = AF_INET6;                                  \
-   (x).sin6_flowinfo = htonl(0);                                  \
-   (x).sin6_scope_id = 0;                                         \
diff --git a/package/dhcp6/patches/patch-server_reply_c b/package/dhcp6/patches/patch-server_reply_c
deleted file mode 100644
index bafca5ae1..000000000
--- a/package/dhcp6/patches/patch-server_reply_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- w-dhcp6-1.0-1.orig/server/reply.c	2002-06-28 14:50:04.000000000 +0200
-+++ w-dhcp6-1.0-1/server/reply.c	2008-10-20 15:29:52.000000000 +0200
-@@ -147,7 +147,7 @@ struct DHCP_MESSAGE * create_dummy_reply
-     opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len;
-     ia_ptr = (struct IA *) malloc (sizeof (struct IA));
-     opt_ptr -> opt_data = ia_ptr;
--    bzero (ia_ptr, sizeof (struct IA));
-+    memset (ia_ptr, 0, sizeof (struct IA));
-     ia_ptr -> u_iaid.iaid = ia_src_ptr -> u_iaid.iaid;
-     
-     // set IAADDR option with values set to null
-@@ -159,7 +159,7 @@ struct DHCP_MESSAGE * create_dummy_reply
-     opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len;
-     iaaddr_ptr = (struct IA_ADDRESS *) malloc (sizeof (struct IA_ADDRESS));
-     opt_ptr -> opt_data = iaaddr_ptr;
--    bzero (iaaddr_ptr, sizeof (struct IA_ADDRESS));
-+    memset (iaaddr_ptr, 0, sizeof (struct IA_ADDRESS));
-     
-     return dhcp_message_ptr;
- }
diff --git a/package/dhcpv6/Config.in b/package/dhcpv6/Config.in
new file mode 100644
index 000000000..569320f0c
--- /dev/null
+++ b/package/dhcpv6/Config.in
@@ -0,0 +1,15 @@
+config ADK_COMPILE_DHCPV6
+	depends on ADK_IPV6
+	depends ADK_PACKAGE_DHCPV6_SERVER
+	tristate
+	default n
+
+config ADK_PACKAGE_DHCPV6_SERVER
+	prompt "dhcpv6-server........................ IPv6 DHCP server"
+	tristate
+	default n
+	select ADK_COMPILE_DHCPV6
+	select ADK_PACKAGE_LIBNCURSES
+	select ADK_PACKAGE_LIBNL
+	help
+	  IPv6 DHCP server
diff --git a/package/dhcpv6/Makefile b/package/dhcpv6/Makefile
new file mode 100644
index 000000000..6fdeaca9e
--- /dev/null
+++ b/package/dhcpv6/Makefile
@@ -0,0 +1,29 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		dhcpv6
+PKG_VERSION:=		1.2.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d537416b33002f56912b7f27477d8d35
+PKG_DESCR:=		Dynamic Host Configuration Protocol for IPv6 (DHCPv6) server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libncurses libnl
+PKG_URL:=		https://fedorahosted.org/dhcpv6
+PKG_SITES:=		https://fedorahosted.org/releases/d/h/dhcpv6/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,DHCPV6_SERVER,dhcpv6-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	autoconf gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DHCP6_SERVER}/usr/sbin 
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcp6/ipkg/files/conffiles b/package/dhcpv6/ipkg/files/conffiles
index 267baa94d..267baa94d 100644
--- a/package/dhcp6/ipkg/files/conffiles
+++ b/package/dhcpv6/ipkg/files/conffiles
diff --git a/package/dhcpv6/patches/patch-configure b/package/dhcpv6/patches/patch-configure
new file mode 100644
index 000000000..2ef218d4a
--- /dev/null
+++ b/package/dhcpv6/patches/patch-configure
@@ -0,0 +1,26 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- dhcpv6-1.2.0.orig/configure	2009-04-03 04:45:15.000000000 +0200
++++ dhcpv6-1.2.0/configure	2009-05-28 23:10:48.955142356 +0200
+@@ -12654,10 +12654,9 @@ done
+ 
+ 
+ 
+-
+ for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
+                   libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
+-                  sys/ioctl.h sys/timeb.h syslog.h
++                  sys/ioctl.h syslog.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -15942,9 +15941,7 @@ fi
+ 
+ 
+ 
+-
+-
+-for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \
++for ac_func in gettimeofday memset select socket strchr strdup \
+                 strerror strrchr strstr strtol strtoul
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/package/dhcpv6/patches/patch-configure.orig b/package/dhcpv6/patches/patch-configure.orig
new file mode 100644
index 000000000..8ba5a08ed
--- /dev/null
+++ b/package/dhcpv6/patches/patch-configure.orig
@@ -0,0 +1,25 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- dhcpv6-1.2.0.orig/configure	2009-04-03 04:45:15.000000000 +0200
++++ dhcpv6-1.2.0/configure	2009-05-28 23:09:45.591183981 +0200
+@@ -12654,10 +12654,9 @@ done
+ 
+ 
+ 
+-
+ for ac_header in arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
+                   libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
+-                  sys/ioctl.h sys/timeb.h syslog.h
++                  sys/ioctl.h syslog.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -15943,8 +15942,7 @@ fi
+ 
+ 
+ 
+-
+-for ac_func in bzero ftime gettimeofday memset select socket strchr strdup \
++for ac_func in ftime gettimeofday memset select socket strchr strdup \
+                 strerror strrchr strstr strtol strtoul
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
diff --git a/package/dhcpv6/patches/patch-configure_ac b/package/dhcpv6/patches/patch-configure_ac
new file mode 100644
index 000000000..3ca204c05
--- /dev/null
+++ b/package/dhcpv6/patches/patch-configure_ac
@@ -0,0 +1,21 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- dhcpv6-1.2.0.orig/configure.ac	2009-04-03 04:33:56.000000000 +0200
++++ dhcpv6-1.2.0/configure.ac	2009-05-28 23:10:31.256646671 +0200
+@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket
+ # Check for headers we must have on the system
+ AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
+                   libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
+-                  sys/ioctl.h sys/timeb.h syslog.h],
++                  sys/ioctl.h syslog.h],
+                  [],
+                  [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
+                  [[#ifdef HAVE_SYS_TYPES_H
+@@ -97,7 +97,7 @@ AC_FUNC_REALLOC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_TYPE_SIGNAL
+ AC_FUNC_STAT
+-AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \
++AC_CHECK_FUNCS([gettimeofday memset select socket strchr strdup \
+                 strerror strrchr strstr strtol strtoul],
+                [],
+                [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
diff --git a/package/dhcpv6/patches/patch-configure_ac.orig b/package/dhcpv6/patches/patch-configure_ac.orig
new file mode 100644
index 000000000..b5ad3d3c8
--- /dev/null
+++ b/package/dhcpv6/patches/patch-configure_ac.orig
@@ -0,0 +1,21 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- dhcpv6-1.2.0.orig/configure.ac	2009-04-03 04:33:56.000000000 +0200
++++ dhcpv6-1.2.0/configure.ac	2009-05-28 23:09:25.701939971 +0200
+@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket
+ # Check for headers we must have on the system
+ AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \
+                   libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \
+-                  sys/ioctl.h sys/timeb.h syslog.h],
++                  sys/ioctl.h syslog.h],
+                  [],
+                  [AC_MSG_FAILURE([*** Header file $ac_header not found.])],
+                  [[#ifdef HAVE_SYS_TYPES_H
+@@ -97,7 +97,7 @@ AC_FUNC_REALLOC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_TYPE_SIGNAL
+ AC_FUNC_STAT
+-AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \
++AC_CHECK_FUNCS([ftime gettimeofday memset select socket strchr strdup \
+                 strerror strrchr strstr strtol strtoul],
+                [],
+                [AC_MSG_FAILURE([*** Required function $ac_func not found.])])
diff --git a/package/dhcpv6/patches/patch-src_relay6_socket_c b/package/dhcpv6/patches/patch-src_relay6_socket_c
new file mode 100644
index 000000000..c5f37d926
--- /dev/null
+++ b/package/dhcpv6/patches/patch-src_relay6_socket_c
@@ -0,0 +1,48 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- dhcpv6-1.2.0.orig/src/relay6_socket.c	2009-04-03 00:53:38.000000000 +0200
++++ dhcpv6-1.2.0/src/relay6_socket.c	2009-05-28 23:09:11.155499136 +0200
+@@ -399,7 +399,7 @@ int send_message() {
+     if (mesg->sent == 1)
+         return 0;
+ 
+-    bzero((char *) &sin6, sizeof(struct sockaddr_in6));
++    memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
+     sin6.sin6_family = AF_INET6;
+     sin6.sin6_flowinfo = 0;
+     sin6.sin6_scope_id = 0;
+@@ -494,7 +494,7 @@ int send_message() {
+     if (mesg->msg_type == DH6_RELAY_FORW) {
+         for (ipv6uni = IPv6_uniaddr_list.next; ipv6uni != &IPv6_uniaddr_list;
+              ipv6uni = ipv6uni->next) {
+-            bzero((char *) &sin6, sizeof(struct sockaddr_in6));
++            memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
+             sin6.sin6_family = AF_INET6;
+ 
+             memset(dest_addr, 0, INET6_ADDRSTRLEN);
+@@ -564,7 +564,7 @@ int send_message() {
+              iface = iface->next) {
+             uservers = iface->sname;
+             while (uservers != NULL) {
+-                bzero((char *) &sin6, sizeof(struct sockaddr_in6));
++                memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
+                 sin6.sin6_family = AF_INET6;
+ 
+                 memset(dest_addr, 0, INET6_ADDRSTRLEN);
+@@ -644,7 +644,7 @@ int send_message() {
+ 
+         for (si = sifaces_list.next; si != &sifaces_list; si = si->next) {
+             *(mesg->hc_pointer) = MAXHOPCOUNT;
+-            bzero((char *) &sin6, sizeof(struct sockaddr_in6));
++            memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
+             sin6.sin6_family = AF_INET6;
+ 
+             memset(dest_addr, 0, INET6_ADDRSTRLEN);
+@@ -734,7 +734,7 @@ int send_message() {
+                     continue;
+ 
+                 *(mesg->hc_pointer) = MAXHOPCOUNT;
+-                bzero((char *) &sin6, sizeof(struct sockaddr_in6));
++                memset((char *) &sin6, 0, sizeof(struct sockaddr_in6));
+                 sin6.sin6_family = AF_INET6;
+ 
+                 memset(dest_addr, 0, INET6_ADDRSTRLEN);
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index 7cd269170..ea99684be 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		digitemp
 PKG_VERSION:=		3.3.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0b6cfb36d198767836de54d9fb11bbdb
-MASTER_SITES:=		http://www.digitemp.com/software/linux/
+PKG_DESCR:=		simple to use program for reading values from 1-wire devices
+PKG_SECTION:=		app
+PKG_DEPENDS:=		libusb
+PKG_URL:=		http://www.digitemp.com/software/linux
+PKG_SITES:=		http://www.digitemp.com/software/linux/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ALL_TARGET=		ds2490
 BUILD_STYLE=		auto
diff --git a/package/digitemp/ipkg/digitemp.control b/package/digitemp/ipkg/digitemp.control
deleted file mode 100644
index a1aff9b2c..000000000
--- a/package/digitemp/ipkg/digitemp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: digitemp
-Priority: optional
-Section: app
-Depends: libusb
-Description: DigiTemp is a simple to use program for reading values from 1-wire devices.
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index ba09c4e95..10fb0b247 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		dnsmasq
 PKG_VERSION:=		2.47
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		4524081e56d0b935717d493e8e8d3e11
-MASTER_SITES:=		http://thekelleys.org.uk/dnsmasq/
+PKG_DESCR:=		A lightweight DNS and DHCP server
+PKG_SECTION:=		net
+PKG_URL:=		http://thekelleys.org.uk/dnsmasq
+PKG_SITES:=		http://thekelleys.org.uk/dnsmasq/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
 INSTALL_STYLE=		manual
@@ -23,9 +26,8 @@ MAKE_FLAGS+=		COPTS="${TCFLAGS} -DNO_IPV6"
 endif
 
 do-install:
-	${INSTALL_DIR} ${IDIR_DNSMASQ}/{etc/init.d,usr/sbin}
+	${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc
 	${INSTALL_BIN} ${WRKBUILD}/src/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/
 	${INSTALL_DATA} files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf
-	${INSTALL_BIN} files/dnsmasq.init ${IDIR_DNSMASQ}/etc/init.d/dnsmasq
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/files/dnsmasq.conffiles
index e30eba8f6..e30eba8f6 100644
--- a/package/dnsmasq/ipkg/dnsmasq.conffiles
+++ b/package/dnsmasq/files/dnsmasq.conffiles
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index e92ad3acc..be9218bcb 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -1,10 +1,11 @@
 #!/bin/sh
-#FWINIT 50
+#PKG dnsmasq
+#INIT 50
 . /etc/rc.conf
 
 case $1 in
-(autostop) ;;
-(autostart)
+autostop) ;;
+autostart)
 	[[ $dns_dhcp = NO ]] && exit 0
 	exec sh $0 start
 	;;
@@ -12,14 +13,14 @@ start)
 	[ -f /etc/dnsmasq.conf ] || exit
 	/usr/sbin/dnsmasq
 	;;
-(stop)
+stop)
 	killall dnsmasq
 	;;
-(restart)
+restart)
 	sh $0 stop
 	sh $0 start
 	;;
-(*)
+*)
 	echo "Usage: $0 {start | stop | restart}"
 	;;
 esac
diff --git a/package/dnsmasq/ipkg/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst
index f2ff69e58..f2ff69e58 100644
--- a/package/dnsmasq/ipkg/dnsmasq.postinst
+++ b/package/dnsmasq/files/dnsmasq.postinst
diff --git a/package/dnsmasq/ipkg/dnsmasq.control b/package/dnsmasq/ipkg/dnsmasq.control
deleted file mode 100644
index 6f61edc65..000000000
--- a/package/dnsmasq/ipkg/dnsmasq.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dnsmasq
-Priority: essential
-Section: net
-Description: A lightweight DNS and DHCP server
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index efda0705b..ce5a0d430 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		dosfstools
 PKG_VERSION:=		3.0.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		94c2ea84b191de958f765ee239457bd9
-MASTER_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
+PKG_DESCR:=		Utilities to create and check MS-DOS FAT filesystems
+PKG_SECTION:=		admin
+PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools
+PKG_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/dosfstools/ipkg/dosfstools.control b/package/dosfstools/ipkg/dosfstools.control
deleted file mode 100644
index 4ec52a01f..000000000
--- a/package/dosfstools/ipkg/dosfstools.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dosfstools
-Priority: optional
-Section: admin
-Description: Utilities to create and check MS-DOS FAT filesystems
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 794af7040..7f69e2d60 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -9,11 +9,14 @@ PKG_NAME:=		dovecot
 PKG_VERSION:=		1.1.14
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		60b1deccc0ae77e5669060d2b1894e5e
-MASTER_SITES:=		http://www.dovecot.org/releases/1.1/
+PKG_DESCR:=		A minimal and secure imap server
+PKG_SECTION:=		net
+PKG_URL:=		http://www.dovecot.org
+PKG_SITES:=		http://www.dovecot.org/releases/1.1/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DOVECOT,dovecot,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ignore_signed_size=1 \
diff --git a/package/dovecot/ipkg/dovecot.control b/package/dovecot/ipkg/dovecot.control
deleted file mode 100644
index 23e9882af..000000000
--- a/package/dovecot/ipkg/dovecot.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dovecot
-Priority: optional
-Section: net
-Description: A minimal and secure imap server
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index a7177388c..186dae9af 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -9,13 +9,18 @@ PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
-MASTER_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
+PKG_DESCR:=		SSH 2 server/client designed for small memory environments
+PKG_SECTION:=		net
+PKG_URL:=		http://matt.ucc.asn.au/dropbear
+PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
 			http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
 
+PKG_DESCR_1:=		Utility for converting SSH keys
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
@@ -44,7 +49,6 @@ do-build:
 
 do-install:
 	# main package
-	$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d
 	$(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/bin
 	$(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/sbin
 	$(INSTALL_BIN) $(WRKBUILD)/dropbearmulti \
@@ -53,8 +57,6 @@ do-install:
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
-	$(INSTALL_DATA) ./files/dropbear.init \
-		$(IDIR_DROPBEAR)/etc/init.d/dropbear
 	# subpackage dropbearconvert
 	$(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index cb1408fa0..b1623c919 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 50
+#PKG dropbear
+#INIT 50
 . /etc/rc.conf
 
 bothlog() {
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
new file mode 100644
index 000000000..1e45f3924
--- /dev/null
+++ b/package/dropbear/files/dropbear.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf '"NO" to disable' dropbear_flags ""
diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control
deleted file mode 100644
index 0aa8cc5b8..000000000
--- a/package/dropbear/ipkg/dropbear.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbear
-Priority: optional
-Section: net
-Description: a small SSH 2 server/client designed for small memory environments.
diff --git a/package/dropbear/ipkg/dropbear.postinst b/package/dropbear/ipkg/dropbear.postinst
deleted file mode 100644
index 30a86fef6..000000000
--- a/package/dropbear/ipkg/dropbear.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable, "@OPTIONS@" otherwise' dropbear_flags "@OPTIONS@"
diff --git a/package/dropbear/ipkg/dropbearconvert.control b/package/dropbear/ipkg/dropbearconvert.control
deleted file mode 100644
index 2b352cea1..000000000
--- a/package/dropbear/ipkg/dropbearconvert.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbearconvert
-Priority: optional
-Section: net
-Description: Utility for converting SSH keys
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 352160d16..e15d98ecc 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -9,12 +9,17 @@ PKG_NAME:=		dsniff
 PKG_VERSION:=		2.4b1
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		2f761fa3475682a7512b0b43568ee7d6
-MASTER_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
+PKG_DESCR:=		collection of tools for network auditing and penetration testing
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libnet libpcap libnids libopenssl libgdbm
+PKG_URL:=		http://www.monkey.org/~dugsong/dsniff
+PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DSNIFF,dsniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-db \
@@ -29,8 +34,7 @@ INSTALL_STYLE=		auto
 FAKE_FLAGS+=		install_prefix="${WRKINST}"
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib
-	${INSTALL_DIR} ${IDIR_DSNIFF}/usr/sbin
+	${INSTALL_DIR} ${IDIR_DSNIFF}/usr/lib ${IDIR_DSNIFF}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_DSNIFF}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/* ${IDIR_DSNIFF}/usr/lib
 
diff --git a/package/dsniff/ipkg/dsniff.control b/package/dsniff/ipkg/dsniff.control
deleted file mode 100644
index 5f1591a1f..000000000
--- a/package/dsniff/ipkg/dsniff.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dsniff
-Priority: optional
-Section: admin
-Depends: libnet, libpcap, libnids, libopenssl, libgdbm
-Description: collection of tools for network auditing and penetration testing
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 2677e327b..12abd583a 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -6,16 +6,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		e2fsprogs
-PKG_VERSION:=		1.41.3
+PKG_VERSION:=		1.41.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b21d26fc46c584021dc9c444933ee1c2
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+PKG_MD5SUM:=		e218df6c84fc17c1126d31de9472a76c
+PKG_DESCR:=		Ext2/3/4 filesystem utilities
+PKG_SECTION:=		admin
+PKG_URL:=		http://e2fsprogs.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+
+PKG_DESCR_1:=		UUID library
+PKG_SECTION_1:=		libs
+PKG_DESCR_2:=		Common error library
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
@@ -34,8 +42,7 @@ pre-build:
 		subst
 
 post-install:
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/sbin
+	${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/
diff --git a/package/e2fsprogs/ipkg/e2fsprogs.control b/package/e2fsprogs/ipkg/e2fsprogs.control
deleted file mode 100644
index 73e023d45..000000000
--- a/package/e2fsprogs/ipkg/e2fsprogs.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: e2fsprogs
-Priority: optional
-Section: admin
-Description: Ext2/3 filesystem utilities
diff --git a/package/e2fsprogs/ipkg/libcom-err.control b/package/e2fsprogs/ipkg/libcom-err.control
deleted file mode 100644
index 4e8d022e8..000000000
--- a/package/e2fsprogs/ipkg/libcom-err.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libcom-err
-Priority: optional
-Section: admin
-Description: Common error library
diff --git a/package/e2fsprogs/ipkg/libuuid.control b/package/e2fsprogs/ipkg/libuuid.control
deleted file mode 100644
index b0f738801..000000000
--- a/package/e2fsprogs/ipkg/libuuid.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libuuid
-Priority: optional
-Section: admin
-Description: UUID libr