ipkgized

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2535 33e552b5-05e3-0310-8538-816dae2090ed

131 files changed, 1470 insertions, 1329 deletions

diff --git a/rules/addons.make b/rules/addons.make
deleted file mode 100644
index 0d408770d..000000000
--- a/rules/addons.make
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifdef PTXCONF_ADDONS
-PACKAGES += addons
-endif
-
-ADDONS_DIR		= $(TOPDIR)/addons
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-addons_get: $(STATEDIR)/addons.get
-
-$(STATEDIR)/addons.get:
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-addons_extract: $(STATEDIR)/addons.extract
-
-$(STATEDIR)/addons.extract: $(STATEDIR)/addons.get
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-addons_prepare: $(STATEDIR)/addons.prepare
-
-$(STATEDIR)/addons.prepare: $(STATEDIR)/addons.extract
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-addons_compile: $(STATEDIR)/addons.compile
-
-$(STATEDIR)/addons.compile: $(STATEDIR)/addons.prepare
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-addons_install: $(STATEDIR)/addons.install
-
-$(STATEDIR)/addons.install: $(STATEDIR)/addons.compile
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-addons_targetinstall: $(STATEDIR)/addons.targetinstall
-
-addons_targetinstall_deps	=  $(STATEDIR)/addons.compile
-
-$(STATEDIR)/addons.targetinstall: $(addons_targetinstall_deps)
-	@$(call targetinfo, $@)
-	@cd $(ROOTDIR) && 					\
-		for i in $(ADDONS_DIR)/*.tar.gz; do 		\
-			echo "Adding stuff from $$i...";	\
-			tar -zxf $$i; 				\
-		done; 
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-addons_clean:
-	rm -rf $(STATEDIR)/addons.*
-	rm -rf $(ADDONS_DIR)
-
-# vim: syntax=make
diff --git a/rules/at-spi.make b/rules/at-spi.make
index 39d77fae0..9faf616bc 100644
--- a/rules/at-spi.make
+++ b/rules/at-spi.make
@@ -54,6 +54,7 @@ $(STATEDIR)/at-spi.extract: $(at-spi_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(AT-SPI_DIR))
 	@$(call extract, $(AT-SPI_SOURCE))
+	@$(call patchin, $(AT-SPI))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -97,8 +98,7 @@ at-spi_compile_deps = $(STATEDIR)/at-spi.prepare
 
 $(STATEDIR)/at-spi.compile: $(at-spi_compile_deps)
 	@$(call targetinfo, $@)
-	cd $(AT-SPI_DIR) && \
-	   $(AT-SPI_PATH) make 
+	cd $(AT-SPI_DIR) && $(AT-SPI_PATH) make 
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -109,8 +109,7 @@ at-spi_install: $(STATEDIR)/at-spi.install
 
 $(STATEDIR)/at-spi.install: $(STATEDIR)/at-spi.compile
 	@$(call targetinfo, $@)
-	cd $(AT-SPI_DIR) && \       
-	   $(AT-SPI_PATH) make install
+	cd $(AT-SPI_DIR) && $(AT-SPI_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -123,6 +122,7 @@ at-spi_targetinstall_deps = $(STATEDIR)/at-spi.compile
 
 $(STATEDIR)/at-spi.targetinstall: $(at-spi_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: something to add to the target for at-spi? 
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/atk124.make b/rules/atk124.make
index bf19c9932..bb810d603 100644
--- a/rules/atk124.make
+++ b/rules/atk124.make
@@ -56,6 +56,7 @@ $(STATEDIR)/atk.extract: $(atk_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(ATK_DIR))
 	@$(call extract, $(ATK_SOURCE))
+	@$(call patchin, $(ATK))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -125,11 +126,22 @@ atk_targetinstall_deps	=  $(STATEDIR)/atk.compile
 $(STATEDIR)/atk.targetinstall: $(atk_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)
-	rm -f $(ROOTDIR)/lib/libatk-1.0.so*
-	install $(ATK_DIR)/atk/.libs/libatk-1.0.so.0.$(ATK_LIB_VERSION) $(ROOTDIR)/lib/
-	ln -s libatk-1.0.so.0.$(ATK_LIB_VERSION) $(ROOTDIR)/lib/libatk-1.0.so.0
-	ln -s libatk-1.0.so.0.$(ATK_LIB_VERSION) $(ROOTDIR)/lib/libatk-1.0.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,atk)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(ATK_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(ATK_DIR)/atk/.libs/libatk-1.0.so.0.$(ATK_LIB_VERSION), \
+		/usr/lib/libatk-1.0.so.o.$(ATK_LIB_VERSION))
+	@$(call install_link, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so.0)
+	@$(call install_link, libatk-1.0.so.0.$(ATK_LIB_VERSION), /usr/lib/libatk-1.0.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -139,6 +151,7 @@ $(STATEDIR)/atk.targetinstall: $(atk_targetinstall_deps)
 
 atk_clean:
 	rm -rf $(STATEDIR)/atk.*
+	rm -rf $(IMAGEDIR)/atk_*
 	rm -rf $(ATK_DIR)
 	rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/atk*.pc
 
diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make
index 3b1e4fb85..18acdebad 100644
--- a/rules/autoconf-2.13.make
+++ b/rules/autoconf-2.13.make
@@ -8,6 +8,8 @@
 # see the README file.
 #
 
+# RSC: FIXME: make this a hosttool
+
 #
 # We provide this package
 #
diff --git a/rules/autoconf-2.57.make b/rules/autoconf-2.57.make
index ff70e37b7..bc19c8f47 100644
--- a/rules/autoconf-2.57.make
+++ b/rules/autoconf-2.57.make
@@ -8,6 +8,8 @@
 # see the README file.
 #
 
+# RSC: FIXME: make this a hosttool 
+
 #
 # We provide this package
 #
diff --git a/rules/automake-1.5.make b/rules/automake-1.5.make
index abe4a1661..784c613c1 100644
--- a/rules/automake-1.5.make
+++ b/rules/automake-1.5.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# RSC: FIXME: make this a hosttool
+
 #
 # Paths and names
 #
diff --git a/rules/automake-1.7.6.make b/rules/automake-1.7.6.make
index 16c7f321a..18ce79af2 100644
--- a/rules/automake-1.7.6.make
+++ b/rules/automake-1.7.6.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# RSC: FIXME: make this a hosttool
+
 #
 # Paths and names
 #
diff --git a/rules/bash.make b/rules/bash.make
index 30b7f45af..acf5a8de1 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -18,7 +18,8 @@ endif
 #
 # Paths and names 
 #
-BASH			= bash-3.0
+BASH_VERSION		= 3.0
+BASH			= bash-$(BASH_VERSION)
 BASH_URL		= $(PTXCONF_SETUP_GNUMIRROR)/bash/$(BASH).tar.gz 
 BASH_SOURCE		= $(SRCDIR)/$(BASH).tar.gz
 BASH_DIR		= $(BUILDDIR)/$(BASH)
@@ -237,10 +238,21 @@ bash_targetinstall: $(STATEDIR)/bash.targetinstall
 
 $(STATEDIR)/bash.targetinstall: $(STATEDIR)/bash.compile
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/bin
-	install $(BASH_DIR)/bash $(ROOTDIR)/bin/bash
-	ln -sf bash $(ROOTDIR)/bin/sh
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/bin/bash
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,BASH)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(BASH_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(BASH_DIR)/bash, /bin/bash)
+	@$(call install_link, bash, /bin/sh)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -248,6 +260,9 @@ $(STATEDIR)/bash.targetinstall: $(STATEDIR)/bash.compile
 # ----------------------------------------------------------------------------
 
 bash_clean: 
-	rm -rf $(STATEDIR)/bash.* $(STATEDIR)/bash-patches.get $(BASH_DIR)
+	rm -rf $(STATEDIR)/bash.* 
+	rm -rf $(IMAGEDIR)/bash_* 
+	rm -fr $(STATEDIR)/bash-patches.get 
+	rm -fr $(BASH_DIR)
 
 # vim: syntax=make
diff --git a/rules/betaftpd.make b/rules/betaftpd.make
index 1f3c01a0f..99c791b40 100644
--- a/rules/betaftpd.make
+++ b/rules/betaftpd.make
@@ -110,7 +110,8 @@ betaftpd_install: $(STATEDIR)/betaftpd.install
 
 $(STATEDIR)/betaftpd.install: $(STATEDIR)/betaftpd.compile
 	@$(call targetinfo, $@)
-	$(BETAFTPD_PATH) make -C $(BETAFTPD_DIR) install
+	# RSC: FIXME: is it correct that we only install and do not targetinstall? 
+	cd $(BETAFTPD_DIR) && $(BETAFTPD_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/bind.make b/rules/bind.make
index e109e24a2..70a4bc657 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -21,10 +21,10 @@ endif
 #
 BIND_VERSION	= 9.3.0rc3
 BIND		= bind-$(BIND_VERSION)
-BIND_SUFFIX		= tar.gz
-BIND_URL		= ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
-BIND_SOURCE		= $(SRCDIR)/$(BIND).$(BIND_SUFFIX)
-BIND_DIR		= $(BUILDDIR)/$(BIND)
+BIND_SUFFIX	= tar.gz
+BIND_URL	= ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
+BIND_SOURCE	= $(SRCDIR)/$(BIND).$(BIND_SUFFIX)
+BIND_DIR	= $(BUILDDIR)/$(BIND)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -124,7 +124,8 @@ bind_install: $(STATEDIR)/bind.install
 
 $(STATEDIR)/bind.install: $(STATEDIR)/bind.compile
 	@$(call targetinfo, $@)
-	$(BIND_PATH) make -C $(BIND_DIR) install
+	# FIXME: RSC: is it right that we only install and do not targetinstall? 
+	cd $(BIND_DIR) && $(BIND_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/binutils.make b/rules/binutils.make
index 371566cd5..c6b382b9a 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -8,6 +8,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: this packet installs only libbfd; check what else we would need
+
 ifdef PTXCONF_LIBBFD
 PACKAGES += binutils
 endif
@@ -125,7 +127,8 @@ binutils_install: $(STATEDIR)/binutils.install
 
 $(STATEDIR)/binutils.install: $(STATEDIR)/binutils.compile
 	@$(call targetinfo, $@)
-	$(BINUTILS_PATH) make -C $(BINUTILS_BUILDDIR)/bfd DESTDIR=$(CROSS_LIB_DIR) prefix='' install 
+	cd $(BINUTILS_BUILDDIR)/bfd && \
+		$(BINUTILS_PATH) make DESTDIR=$(CROSS_LIB_DIR) prefix='' install 
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -136,8 +139,21 @@ binutils_targetinstall: $(STATEDIR)/binutils.targetinstall
 
 $(STATEDIR)/binutils.targetinstall: $(STATEDIR)/binutils.install
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/lib
-	cp -d $(BINUTILS_BUILDDIR)/bfd/.libs/libbfd*.so $(ROOTDIR)/usr/lib
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,binutils)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PTXCONF_BINUTILS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: this will probably not work with the wildcard; fix when it breaks :-) 
+	@$(call install_copy, 0, 0, 0644, $(BINUTILS_BUILDDIR)/bfd/.libs/libbfd*.so, /usr/lib)
+
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/blackbox.make b/rules/blackbox.make
index e19072131..7256ca464 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -128,11 +128,21 @@ blackbox_targetinstall_deps = $(STATEDIR)/blackbox.compile
 
 $(STATEDIR)/blackbox.targetinstall: $(blackbox_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/X11R6/bin
-	install $(BLACKBOX_DIR)/src/blackbox $(ROOTDIR)/usr/X11R6/bin/	
-	install $(BLACKBOX_DIR)/util/bsetroot $(ROOTDIR)/usr/X11R6/bin/	
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/bin/blackbox
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/bin/bsetroot
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,blackbox)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(BLACKBOX_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(BLACKBOX_DIR)/src/blackbox, /usr/X11R6/bin/blackbox)
+	@$(call install_copy, 0, 0, 0755, $(BLACKBOX_DIR)/util/bsetroot, /usr/X11R6/bin/bsetroot)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/bootdisk.make b/rules/bootdisk.make
index ebe9aad13..b246d5fe2 100644
--- a/rules/bootdisk.make
+++ b/rules/bootdisk.make
@@ -8,6 +8,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: this should probably be heavily rewritten
+
 #
 # We provide this package
 #
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index 6dea76987..d0528270f 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -8,6 +8,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: ipkgize
+
 #
 # We provide this package
 #
@@ -20,10 +22,10 @@ endif
 #
 BRIDGE_UTILS_VERSION	= 1.0.4
 BRIDGE_UTILS		= bridge-utils-$(BRIDGE_UTILS_VERSION)
-BRIDGE_UTILS_SUFFIX		= tar.gz
-BRIDGE_UTILS_URL		= http://unc.dl.sourceforge.net/sourceforge/bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
-BRIDGE_UTILS_SOURCE		= $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
-BRIDGE_UTILS_DIR		= $(BUILDDIR)/$(BRIDGE_UTILS)
+BRIDGE_UTILS_SUFFIX	= tar.gz
+BRIDGE_UTILS_URL	= http://unc.dl.sourceforge.net/sourceforge/bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
+BRIDGE_UTILS_SOURCE	= $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
+BRIDGE_UTILS_DIR	= $(BUILDDIR)/$(BRIDGE_UTILS)
 
 # ----------------------------------------------------------------------------
 # Get
diff --git a/rules/clementine.make b/rules/clementine.make
index 9b98e26be..f3499b2e0 100644
--- a/rules/clementine.make
+++ b/rules/clementine.make
@@ -111,8 +111,20 @@ clementine_targetinstall_deps	=  $(STATEDIR)/clementine.compile
 
 $(STATEDIR)/clementine.targetinstall: $(clementine_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/X11R6/bin
-	install $(CLEMENTINE_DIR)/clementine $(ROOTDIR)/usr/X11R6/bin/
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,clementine)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(CLEMENTINE_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(CLEMENTINE_DIR)/clementine, /usr/X11R6/bin/clementine)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -121,6 +133,7 @@ $(STATEDIR)/clementine.targetinstall: $(clementine_targetinstall_deps)
 
 clementine_clean:
 	rm -rf $(STATEDIR)/clementine.*
+	rm -rf $(IMAGEDIR)/clementine_*
 	rm -rf $(CLEMENTINE_DIR)
 
 # vim: syntax=make
diff --git a/rules/clock.make b/rules/clock.make
index 2399ace12..a348f6ee9 100644
--- a/rules/clock.make
+++ b/rules/clock.make
@@ -109,8 +109,20 @@ clock_targetinstall_deps = $(STATEDIR)/clock.compile
 
 $(STATEDIR)/clock.targetinstall: $(clock_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -D $(CLOCK_DIR)/clock $(ROOTDIR)/sbin/clock
-	$(CROSSSTRIP) -R .note -R comment $(ROOTDIR)/sbin/clock
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,clock)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(CLOCK_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(CLOCK_DIR)/clock, /sbin/clock)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -119,6 +131,7 @@ $(STATEDIR)/clock.targetinstall: $(clock_targetinstall_deps)
 
 clock_clean:
 	rm -rf $(STATEDIR)/clock.*
+	rm -rf $(IMAGEDIR)/clock_*
 	rm -rf $(CLOCK_DIR)
 
 # vim: syntax=make
diff --git a/rules/coreutils.ipkg b/rules/coreutils.ipkg
deleted file mode 100644
index 9dba07d39..000000000
--- a/rules/coreutils.ipkg
+++ /dev/null
@@ -1,12 +0,0 @@
-Package:	coreutils
-Priority:	optional
-Version:	@VERSION@
-Section:  	base
-Architecture:	@ARCH@
-Maintainer:	Robert Schwebel <r.schwebel@pengutronix.de>
-Depends:	libc6
-Source: 	http://www.pengutronix.de/software/ptxdist_de.html
-Description:	coreutils contain some of the most important Linux
-		utilities. This description should be autogenerated from the
-		Kconfig file where it also has to be defined. 
-
diff --git a/rules/cramfs.make b/rules/cramfs.make
index ffe5269f2..10ff9077c 100644
--- a/rules/cramfs.make
+++ b/rules/cramfs.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: make this a hosttool
+
 #
 # We provide this package
 #
@@ -19,7 +21,8 @@ endif
 #
 # Paths and names
 #
-CRAMFS		= cramfs-1.1
+CRAMFS_VERSION	= 1.1
+CRAMFS		= cramfs-$(CRAMFS_VERSION)
 CRAMFS_SUFFIX	= tar.gz
 CRAMFS_URL	= $(PTXCONF_SETUP_SFMIRROR)/cramfs/$(CRAMFS).$(CRAMFS_SUFFIX)
 CRAMFS_SOURCE	= $(SRCDIR)/$(CRAMFS).$(CRAMFS_SUFFIX)
diff --git a/rules/db41.make b/rules/db41.make
index 5f0edb835..edfcdc2a8 100644
--- a/rules/db41.make
+++ b/rules/db41.make
@@ -120,13 +120,23 @@ db41_targetinstall_deps: $(STATEDIR)/db41.targetinstall
 
 $(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/bin 
-	install $(CROSS_LIB_DIR)/bin/db_* $(ROOTDIR)/usr/bin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/db_* 
 
-	install -d $(ROOTDIR)/usr/lib 
-	cp -pd $(CROSS_LIB_DIR)/lib/libdb*.so* $(ROOTDIR)/usr/lib
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libdb*.so* 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,db41)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(DB41_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	# FIXME: RSC: the wildcard will probably break; fix when needed :-) 
+	# FIXME: RSC: use correct paths from the build directories
+	@$(call install_copy, 0, 0, 0755, $(CROSS_LIB_DIR)/bin/db_*, /usr/bin/)
+	@$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libdb*.so*, /usr/lib/)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -135,6 +145,7 @@ $(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps)
 
 db41_clean:
 	rm -rf $(STATEDIR)/db41.*
+	rm -rf $(IMAGEDIR)/db41_*
 	rm -rf $(DB41_DIR)
 
 # vim: syntax=make
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 36a2735c9..5a61da2b7 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -117,8 +117,20 @@ dhcp_targetinstall_deps = $(STATEDIR)/dhcp.compile
 
 $(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -c -m 755 $(DHCP_DIR)/work.linux-2.2/server/dhcpd $(ROOTDIR)/usr/sbin
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/dhcpd
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,dhcp)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(DHCP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/server/dhcpd, /usr/sbin/dhcpd)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -127,6 +139,7 @@ $(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps)
 
 dhcp_clean:
 	rm -rf $(STATEDIR)/dhcp.*
+	rm -rf $(IMAGEDIR)/dhcp_*
 	rm -rf $(DHCP_DIR)
 
 # vim: syntax=make
diff --git a/rules/dialog.make b/rules/dialog.make
index 60f9432bf..916009892 100644
--- a/rules/dialog.make
+++ b/rules/dialog.make
@@ -123,6 +123,7 @@ dialog_targetinstall_deps = $(STATEDIR)/dialog.compile
 
 $(STATEDIR)/dialog.targetinstall: $(dialog_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: RSC: nothing to do on targetinstall? 
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index c83b7597c..1840ca7c1 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -113,8 +113,20 @@ dnsmasq_targetinstall_deps = $(STATEDIR)/dnsmasq.compile
 
 $(STATEDIR)/dnsmasq.targetinstall: $(dnsmasq_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -m 755 $(DNSMASQ_DIR)/src/dnsmasq $(ROOTDIR)/sbin/dnsmasq
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/dnsmasq
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,dnsmasq)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(DNSMASQ_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(DNSMASQ_DIR)/src/dnsmasq, /sbin/dnsmasq)
+
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -123,6 +135,7 @@ $(STATEDIR)/dnsmasq.targetinstall: $(dnsmasq_targetinstall_deps)
 
 dnsmasq_clean:
 	rm -rf $(STATEDIR)/dnsmasq.*
+	rm -rf $(IMAGEDIR)/dnsmasq_*
 	rm -rf $(DNSMASQ_DIR)
 
 # vim: syntax=make
diff --git a/rules/dropbear.make b/rules/dropbear.make
index af2d0d2b3..41d88e7df 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -267,33 +267,33 @@ endif
 $(STATEDIR)/dropbear.targetinstall: $(dropbear_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)/usr/bin
-	install -d $(ROOTDIR)/usr/sbin
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,dropbear)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(DROPBEAR_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR
-	install $(DROPBEAR_DIR)/dropbear \
-		$(ROOTDIR)/usr/sbin/dropbear
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/dropbear
+	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbear, /usr/sbin/dropbear)
 endif
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR_KEY
-	install $(DROPBEAR_DIR)/dropbearkey \
-		$(ROOTDIR)/usr/bin/dropbearkey
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/dropbearkey
+	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearkey, /usr/sbin/dropbearkey)
 endif
 
 ifdef PTXCONF_DROPBEAR_DROPBEAR_CONVERT
-	install $(DROPBEAR_DIR)/dropbearconvert \
-		$(ROOTDIR)/usr/sbin/dropbearconvert
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/dropbearconvert
+	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/dropbearconvert, /usr/sbin/dropbearconvert)
 endif
 
 ifdef PTXCONF_DROPBEAR_SCP
-	install $(DROPBEAR_DIR)/scp \
-		$(ROOTDIR)/usr/bin/scp
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/scp
+	@$(call install_copy, 0, 0, 0755, $(DROPBEAR_DIR)/scp, /usr/bin/scp)
 endif
 
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -302,6 +302,7 @@ endif
 
 dropbear_clean:
 	rm -rf $(STATEDIR)/dropbear.*
+	rm -rf $(IMAGEDIR)/dropbear_*
 	rm -rf $(DROPBEAR_DIR)
 
 # vim: syntax=make
diff --git a/rules/e2tools.make b/rules/e2tools.make
index 394b2297d..a8bb94566 100644
--- a/rules/e2tools.make
+++ b/rules/e2tools.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: make this a hosttool? 
+
 #
 # We provide this package
 #
@@ -21,9 +23,9 @@ endif
 #
 HOSTTOOLS_E2TOOLS_VERSION	= 0.0.15
 HOSTTOOLS_E2TOOLS		= e2tools-$(HOSTTOOLS_E2TOOLS_VERSION)
-HOSTTOOLS_E2TOOLS_SUFFIX		= tar.gz
+HOSTTOOLS_E2TOOLS_SUFFIX	= tar.gz
 HOSTTOOLS_E2TOOLS_URL		= http://home.earthlink.net/~k_sheff/sw/e2tools/$(E2TOOLS).$(HOSTTOOLS_E2TOOLS_SUFFIX)
-HOSTTOOLS_E2TOOLS_SOURCE		= $(SRCDIR)/$(E2TOOLS).$(HOSTTOOLS_E2TOOLS_SUFFIX)
+HOSTTOOLS_E2TOOLS_SOURCE	= $(SRCDIR)/$(E2TOOLS).$(HOSTTOOLS_E2TOOLS_SUFFIX)
 HOSTTOOLS_E2TOOLS_DIR		= $(BUILDDIR)/$(E2TOOLS)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/ethereal.make b/rules/ethereal.make
index de02ce1ca..a17584b25 100644
--- a/rules/ethereal.make
+++ b/rules/ethereal.make
@@ -136,6 +136,7 @@ ethereal_install: $(STATEDIR)/ethereal.install
 
 $(STATEDIR)/ethereal.install: $(STATEDIR)/ethereal.compile
 	@$(call targetinfo, $@)
+	# FIXME: RSC: why do we do that on install, not on targetinstall? 
 	cd $(ETHEREAL_DIR) && $(ETHEREAL_ENV) $(ETHEREAL_PATH) make install
 	touch $@
 
diff --git a/rules/etherwake.make b/rules/etherwake.make
index 27c70f8ef..04d694bf3 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -114,9 +114,20 @@ etherwake_targetinstall_deps = $(STATEDIR)/etherwake.compile
 
 $(STATEDIR)/etherwake.targetinstall: $(etherwake_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/sbin
-	install  $(ETHERWAKE_DIR)/etherwake $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/etherwake
+	
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,etherwake)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(ETHERWAKE_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(ETHERWAKE_DIR)/etherwake, /usr/sbin)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -125,6 +136,7 @@ $(STATEDIR)/etherwake.targetinstall: $(etherwake_targetinstall_deps)
 
 etherwake_clean:
 	rm -rf $(STATEDIR)/etherwake.*
+	rm -rf $(IMAGEDIR)/etherwake_*
 	rm -rf $(ETHERWAKE_DIR)
 
 # vim: syntax=make
diff --git a/rules/flash.make b/rules/flash.make
index e3aef9f17..a12fe8532 100644
--- a/rules/flash.make
+++ b/rules/flash.make
@@ -18,18 +18,20 @@ endif
 #
 # Paths and names 
 #
-FLASH			= flash-0.9.5
+FLASH_VERSION		= 0.9.5
+FLASH			= flash-$(FLASH_VERSION)
 FLASH_URL 		= http://www.netsoc.ucd.ie/flash/$(FLASH).tar.gz
 FLASH_SOURCE		= $(SRCDIR)/$(FLASH).tar.gz
 FLASH_DIR 		= $(BUILDDIR)/$(FLASH)
 FLASH_EXTRACT		= gzip -dc
 
-FLASH_PATCH		= flash-0.9.5-ptx2.diff
+# FIXME: RSC: convert this to use the patch repository; this is a bugfix patch!
+
+FLASH_PATCH		= flash-$(FLASH_VERSION)-ptx2.diff
 FLASH_PATCH_URL		= http://www.pengutronix.de/software/ptxdist/temporary-src/$(FLASH_PATCH)
 FLASH_PATCH_SOURCE	= $(SRCDIR)/$(FLASH_PATCH)
 FLASH_PATCH_EXTRACT	= cat
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
@@ -145,22 +147,33 @@ flash_targetinstall_deps += $(STATEDIR)/ncurses.targetinstall
 
 $(STATEDIR)/flash.targetinstall: $(flash_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/bin
-	install $(FLASH_DIR)/flash $(ROOTDIR)/usr/bin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/flash
-	install -d $(ROOTDIR)/usr/lib/flash/
-	install $(FLASH_DIR)/modules/alarms $(ROOTDIR)/usr/lib/flash/
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/flash/alarms
-	install $(FLASH_DIR)/modules/background $(ROOTDIR)/usr/lib/flash/
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/flash/background
-	install $(FLASH_DIR)/modules/countdown $(ROOTDIR)/usr/lib/flash/
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/flash/countdown
+	
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,flash)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(FLASH_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/flash, /usr/bin/flash)
+
+	# FIMXE: RSC: permissions? 
+	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/alarms, /usr/lib/flash/alarms)
+	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/background, /usr/lib/flash/background)
+	@$(call install_copy, 0, 0, 0755, $(FLASH_DIR)/modules/countdown, /usr/lib/flash/countdown)
+
+	@$(call install_finish)
+
 	touch $@
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------
 
 flash_clean: 
-	rm -rf $(STATEDIR)/flash.* $(FLASH_DIR)
+	rm -fr $(STATEDIR)/flash.* 
+	rm -fr $(IMAGEDIR)/flash_* 
+	rm -fr $(FLASH_DIR)
 
 # vim: syntax=make
diff --git a/rules/flex.make b/rules/flex.make
index b5e36efc6..7f558ba85 100644
--- a/rules/flex.make
+++ b/rules/flex.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: make this a hosttool? 
+
 #
 # We provide this package
 #
diff --git a/rules/fltk.make b/rules/fltk.make
index 337b663c0..a6869062d 100644
--- a/rules/fltk.make
+++ b/rules/fltk.make
@@ -152,9 +152,21 @@ fltk_targetinstall_deps	=  $(STATEDIR)/fltk.compile \
 
 $(STATEDIR)/fltk.targetinstall: $(fltk_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/lib
-	cp -pd $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk*.so* $(ROOTDIR)/lib
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/lib/libfltk*
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,fltk)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(FLTK_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: use correct path to build dir here!
+	@$(call install_copy, 0, 0, 0644, $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk*.so*, /lib)
+	
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -163,6 +175,7 @@ $(STATEDIR)/fltk.targetinstall: $(fltk_targetinstall_deps)
 
 fltk_clean:
 	rm -rf $(STATEDIR)/fltk.*
+	rm -rf $(BUILDDIR)/fltk_*
 	rm -rf $(FLTK_DIR)
 
 # vim: syntax=make
diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make
index de06dcf7d..8a291f060 100644
--- a/rules/fontconfig22.make
+++ b/rules/fontconfig22.make
@@ -144,11 +144,24 @@ fontconfig22_targetinstall_deps +=	$(STATEDIR)/freetype.targetinstall
 
 $(STATEDIR)/fontconfig22.targetinstall: $(fontconfig22_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)
-	rm -f $(ROOTDIR)/lib/libfontconfig.so*
-	install $(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4 $(ROOTDIR)/lib/
-	ln -sf libfontconfig.so.1.0.4 $(ROOTDIR)/lib/libfontconfig.so.1
-	ln -sf libfontconfig.so.1.0.4 $(ROOTDIR)/lib/libfontconfig.so
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,fontconfig22)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(FONTCONFIG22_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4, \
+		/usr/lib/libfontconfig.so.1.0.4)
+	@$(call install_link, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so.1)
+	@$(call install_link, libfontconfig.so.1.0.4, /usr/lib/libfontconfig.so)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -157,6 +170,7 @@ $(STATEDIR)/fontconfig22.targetinstall: $(fontconfig22_targetinstall_deps)
 
 fontconfig22_clean:
 	rm -rf $(STATEDIR)/fontconfig22.*
+	rm -rf $(IMAGEDIR)/fontconfig22_*
 	rm -rf $(FONTCONFIG22_DIR)
 
 # vim: syntax=make
diff --git a/rules/freetype.make b/rules/freetype.make
index b19326a5b..703c8667f 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -130,11 +130,24 @@ freetype_targetinstall_deps	+= $(STATEDIR)/expat.targetinstall
 
 $(STATEDIR)/freetype.targetinstall: $(freetype_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)
-	rm -f $(ROOTDIR)/lib/libfreetype.so*
-	install $(FREETYPE_DIR)/objs/.libs/libfreetype.so.6.3.5 $(ROOTDIR)/lib/
-	ln -sf libfreetype.so.6.3.5 $(ROOTDIR)/lib/libfreetype.so.6
-	ln -sf libfreetype.so.6.3.5 $(ROOTDIR)/lib/libfreetype.so
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,freetype)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(FREETYPE_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0644, \
+		$(FREETYPE_DIR)/objs/.libs/libfreetype.so.6.3.5, \
+		/usr/lib/libfreetype.so.6.3.5)
+	@$(call install_link, libfreetype.so.6.3.5, /usr/lib/libfreetype.so.6)		
+	@$(call install_link, libfreetype.so.6.3.5, /usr/lib/libfreetype.so)		
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -143,6 +156,7 @@ $(STATEDIR)/freetype.targetinstall: $(freetype_targetinstall_deps)
 
 freetype_clean:
 	rm -rf $(STATEDIR)/freetype.*
+	rm -rf $(IMAGEDIR)/freetype_*
 	rm -rf $(FREETYPE_DIR)
 
 # vim: syntax=make
diff --git a/rules/gail.make b/rules/gail.make
index 61991e42e..b8b894f50 100644
--- a/rules/gail.make
+++ b/rules/gail.make
@@ -126,14 +126,22 @@ gail_targetinstall_deps = $(STATEDIR)/libgnomecanvas.targetinstall
 $(STATEDIR)/gail.targetinstall: $(gail_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)/usr/lib
-        
-	install $(GAIL_DIR)/gail/.libs/libgail.so $(ROOTDIR)/usr/lib
-
-	install $(GAIL_DIR)/libgail-util/.libs/libgailutil.so.17.0.0 $(ROOTDIR)/usr/lib
-	ln -sf libgailutil.so.17.0.0 $(ROOTDIR)/usr/lib/libgailutil.so.17.0
-	ln -sf libgailutil.so.17.0.0 $(ROOTDIR)/usr/lib/libgailutil.so.17
-	ln -sf libgailutil.so.17.0.0 $(ROOTDIR)/usr/lib/libgailutil.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gail)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GAIL_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, $(GAIL_DIR)/gail/.libs/libgail.so, /usr/lib/libgail.so)
+	@$(call install_copy, 0, 0, 0644, $(GAIL_DIR)/libgail-util/.libs/libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0.0)
+	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17.0)
+	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so.17)
+	@$(call install_link, libgailutil.so.17.0.0, /usr/lib/libgailutil.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -143,6 +151,7 @@ $(STATEDIR)/gail.targetinstall: $(gail_targetinstall_deps)
 
 gail_clean:
 	rm -rf $(STATEDIR)/gail.*
+	rm -rf $(IMAGEDIR)/gail_*
 	rm -rf $(GAIL_DIR)
 
 # vim: syntax=make
diff --git a/rules/gawk.make b/rules/gawk.make
index 93a644306..fdaf24c7d 100644
--- a/rules/gawk.make
+++ b/rules/gawk.make
@@ -54,6 +54,7 @@ $(STATEDIR)/gawk.extract: $(gawk_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GAWK_DIR))
 	@$(call extract, $(GAWK_SOURCE))
+	@$(call patchin, $(GAWK))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -120,6 +121,7 @@ gawk_targetinstall_deps = $(STATEDIR)/gawk.compile
 
 $(STATEDIR)/gawk.targetinstall: $(gawk_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: RSC: ipkgize
 	$(GAWK_PATH) make -C $(GAWK_DIR) install
 	touch $@
 
diff --git a/rules/gdb-wrapper.make b/rules/gdb-wrapper.make
index bc6a16cee..8a4c0adf5 100644
--- a/rules/gdb-wrapper.make
+++ b/rules/gdb-wrapper.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: what's the purpose of that? 
+
 #
 # We provide this package
 #
diff --git a/rules/gettext.make b/rules/gettext.make
index 275d210eb..593366296 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -55,6 +55,7 @@ $(STATEDIR)/gettext.extract: $(gettext_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GETTEXT_DIR))
 	@$(call extract, $(GETTEXT_SOURCE))
+	@$(call patchin, $(GETTEXT))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -130,11 +131,23 @@ gettext_targetinstall_deps = $(STATEDIR)/gettext.compile
 
 $(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/lib
-	rm -f $(ROOTDIR)/lib/libgnuintl.so*
-	install $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so.* $(ROOTDIR)/lib/
-#	ln -s $(ROOTDIR)/lib/libgnuintl.so.* $(ROOTDIR)/lib/libgnuintl.so.2
-#	ln -s $(ROOTDIR)/lib/libgnuintl.so.2 $(ROOTDIR)/lib/libgnuintl.so
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gettext)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GETTEXT_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	# FIXME: RSC: do wildcards work? 
+	@$(call install_copy, 0, 0, 0644, $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so.*, /usr/lib/)
+	@$(call install_link, libgnuintl.so.*, /lib/libgnuintl.so.2)
+	@$(call install_link, libgnuintl.so.*, /lib/libgnuintl.so)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -143,6 +156,7 @@ $(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps)
 
 gettext_clean:
 	rm -rf $(STATEDIR)/gettext.*
+	rm -rf $(IMAGEDIR)/gettext_*
 	rm -rf $(GETTEXT_DIR)
 
 # vim: syntax=make
diff --git a/rules/glib1210.make b/rules/glib1210.make
index 08ce97e89..3efefdfe3 100644
--- a/rules/glib1210.make
+++ b/rules/glib1210.make
@@ -140,20 +140,31 @@ glib1210_targetinstall_deps	=  $(STATEDIR)/glib1210.compile
 $(STATEDIR)/glib1210.targetinstall: $(glib1210_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-# glib
-	install $(GLIB1210_DIR)/.libs/libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/
-	ln -sf libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/libglib-1.2.so.0
-	ln -sf libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/libglib-1.2.so
-
-# gmodule
-	install $(GLIB1210_DIR)/gmodule/.libs/libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/
-	ln -sf libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/libgmodule-1.2.so.0
-	ln -sf libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/libgmodule-1.2.so
-
-# gthread
-	install $(GLIB1210_DIR)/gthread/.libs/libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/
-	ln -sf libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/libgthread-1.2.so.0
-	ln -sf libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/libgthread-1.2.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,glib1210)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GLIB1210_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# glib
+	@$(call install_copy, 0, 0, 0644, $(GLIB1210_DIR)/.libs/libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0.0.10)
+	@$(call install_link, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so.0)
+	@$(call install_link, libglib-1.2.so.0.0.10, /usr/lib/libglib-1.2.so)
+
+	# gmodule
+	@$(call install_copy, 0, 0, 0644, $(GLIB1210_DIR)/gmodule/.libs/libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0.0.10)
+	@$(call install_link, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so.0)
+	@$(call install_link, libgmodule-1.2.so.0.0.10, /usr/lib/libgmodule-1.2.so)
+
+	# gthread
+	@$(call install_copy, 0, 0, 0644, $(GLIB1210_DIR)/gthread/.libs/libgthread-1.2.so.0.0.10, /usr/lib/libgthread-1.2.so.0.0.10)
+	@$(call install_link, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so.0)
+	@$(call install_link, libgthread-1.2.so.0.0.10 /usr/lib/libgthread-1.2.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -163,6 +174,7 @@ $(STATEDIR)/glib1210.targetinstall: $(glib1210_targetinstall_deps)
 
 glib1210_clean:
 	rm -rf $(STATEDIR)/glib1210.*
+	rm -rf $(IMAGEDIR)/glib1210_*
 	rm -rf $(GLIB1210_DIR)
 
 # vim: syntax=make
diff --git a/rules/glib22.make b/rules/glib22.make
index 291ad7197..baa51bc65 100644
--- a/rules/glib22.make
+++ b/rules/glib22.make
@@ -133,24 +133,41 @@ glib22_targetinstall_deps	=  $(STATEDIR)/glib22.compile
 
 $(STATEDIR)/glib22.targetinstall: $(glib22_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)
-	rm -f $(ROOTDIR)/lib/libglib-2.0.so*
 
-	install $(GLIB22_DIR)/glib/.libs/libglib-2.0.so.0.302.0 $(ROOTDIR)/lib/
-	ln -sf libglib-2.0.so.0.302.0 $(ROOTDIR)/lib/libglib-2.0.so.0
-	ln -sf libglib-2.0.so.0.302.0 $(ROOTDIR)/lib/libglib-2.0.so
-
-	install $(GLIB22_DIR)/gobject/.libs/libgobject-2.0.so.0.302.0 $(ROOTDIR)/lib/
-	ln -sf libgobject-2.0.so.0.302.0 $(ROOTDIR)/lib/libgobject-2.0.so.0
-	ln -sf libgobject-2.0.so.0.302.0 $(ROOTDIR)/lib/libgobject-2.0.so
-
-	install $(GLIB22_DIR)/gmodule/.libs/libgmodule-2.0.so.0.302.0 $(ROOTDIR)/lib/
-	ln -sf libgmodule-2.0.so.0.302.0 $(ROOTDIR)/lib/libgmodule-2.0.so.0
-	ln -sf libgmodule-2.0.so.0.302.0 $(ROOTDIR)/lib/libgmodule-2.0.so
-
-	install $(GLIB22_DIR)/gthread/.libs/libgthread-2.0.so.0.302.0 $(ROOTDIR)/lib/
-	ln -sf libgthread-2.0.so.0.302.0 $(ROOTDIR)/lib/libgthread-2.0.so.0
-	ln -sf libgthread-2.0.so.0.302.0 $(ROOTDIR)/lib/libgthread-2.0.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,glib22)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GLIB22_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GLIB22_DIR)/glib/.libs/libglib-2.0.so.0.302.0, \
+		/usr/lib/libglib-2.0.so.0.302.0)
+	@$(call install_link, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so.0)
+	@$(call install_link, libglib-2.0.so.0.302.0, /usr/lib/libglib-2.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GLIB22_DIR)/gobject/.libs/libgobject-2.0.so.0.302.0, \
+		/usr/lib/libgobject-2.0.so.0.302.0)
+	@$(call install_link, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so.0)
+	@$(call install_link, libgobject-2.0.so.0.302.0, /usr/lib/libgobject-2.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GLIB22_DIR)/gmodule/.libs/libgmodule-2.0.so.0.302.0, \
+		/usr/lib/libgmodule-2.0.so.0.302.0)
+	@$(call install_link, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so.0)
+	@$(call install_link, libgmodule-2.0.so.0.302.0, /usr/lib/libgmodule-2.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GLIB22_DIR)/gthread/.libs/libgthread-2.0.so.0.302.0, \
+		/usr/lib/libgthread-2.0.so.0.302.0)
+	@$(call install_link, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so.0)
+	@$(call install_link, libgthread-2.0.so.0.302.0, /usr/lib/libgthread-2.0.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -160,6 +177,7 @@ $(STATEDIR)/glib22.targetinstall: $(glib22_targetinstall_deps)
 
 glib22_clean:
 	rm -rf $(STATEDIR)/glib22.*
+	rm -rf $(IMAGEDIR)/glib22_*
 	rm -rf $(GLIB22_DIR)
 	rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/glib-2.0*.pc
 	rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/gmodule-2.0*.pc
diff --git a/rules/gmp3.make b/rules/gmp3.make
index 6d7b14523..bdec2e206 100644
--- a/rules/gmp3.make
+++ b/rules/gmp3.make
@@ -99,9 +99,20 @@ gmp3_targetinstall: $(STATEDIR)/gmp3.targetinstall
 
 $(STATEDIR)/gmp3.targetinstall: $(STATEDIR)/gmp3.install
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/lib
-	cp -d $(CROSS_LIB_DIR)/lib/libgmp.so* $(ROOTDIR)/lib
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libgmp.so*
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gmp3)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GMP3_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: RSC: check if wildcard copy works
+	@$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/lib/libgmp.so*, /usr/lib/)
+
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,6 +121,7 @@ $(STATEDIR)/gmp3.targetinstall: $(STATEDIR)/gmp3.install
 
 gmp3_clean: 
 	rm -rf $(STATEDIR)/gmp3.* 
+	rm -rf $(IMAGEDIR)/gmp3_* 
 	rm -rf $(GMP3_DIR)
 
 # vim: syntax=make
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 33411ea02..f48ba4966 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -194,8 +194,20 @@ endif
 
 $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps)
 	@$(call targetinfo, $@)
-	cp -a $(GNUPLOT_DIR)/src/gnuplot $(ROOTDIR)/usr/bin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/busybox
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gnuplot)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GNUPLOT_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(GNUPLOT_DIR)/src/gnuplot, /usr/bin/gnuplot)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -204,6 +216,7 @@ $(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps)
 
 gnuplot_clean:
 	rm -rf $(STATEDIR)/gnuplot.*
+	rm -rf $(IMAGEDIR)/gnuplot_*
 	rm -rf $(GNUPLOT_DIR)
 
 # vim: syntax=make
diff --git a/rules/grub.make b/rules/grub.make
index 7b3c49c9d..db457f363 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -18,7 +18,8 @@ endif
 #
 # Paths and names 
 #
-GRUB			= grub-0.95
+GRUB_VERSION		= 0.95
+GRUB			= grub-$(GRUB_VERSION)
 GRUB_URL		= ftp://alpha.gnu.org/gnu/grub/$(GRUB).tar.gz
 GRUB_SOURCE		= $(SRCDIR)/$(GRUB).tar.gz
 GRUB_DIR		= $(BUILDDIR)/$(GRUB)
@@ -166,9 +167,22 @@ grub_targetinstall: $(STATEDIR)/grub.targetinstall
 
 $(STATEDIR)/grub.targetinstall: $(STATEDIR)/grub.install
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/boot/grub
-	install $(GRUB_DIR)/stage1/stage1 $(ROOTDIR)/boot/grub/
-	install $(GRUB_DIR)/stage2/stage2 $(ROOTDIR)/boot/grub/
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,grub)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GRUB_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: this looks like something is missing
+	@$(call install_copy, 0, 0, 0644, $(GRUB_DIR)/stage1/stage1, /boot/grub/stage1)
+	@$(call install_copy, 0, 0, 0644, $(GRUB_DIR)/stage2/stage2, /boot/grub/stage2)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -176,6 +190,8 @@ $(STATEDIR)/grub.targetinstall: $(STATEDIR)/grub.install
 # ----------------------------------------------------------------------------
 
 grub_clean: 
-	rm -rf $(STATEDIR)/grub.* $(GRUB_DIR)
+	rm -rf $(STATEDIR)/grub.* 
+	rm -rf $(IMAGEDIR)/grub_* 
+	rm -rf $(GRUB_DIR)
 
 # vim: syntax=make
diff --git a/rules/gtk1210.make b/rules/gtk1210.make
index 4a0f3db4c..a1a72cd9e 100644
--- a/rules/gtk1210.make
+++ b/rules/gtk1210.make
@@ -55,6 +55,7 @@ $(STATEDIR)/gtk1210.extract: $(gtk1210_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GTK1210_DIR))
 	@$(call extract, $(GTK1210_SOURCE))
+	@$(call patchin, $(GTK1210))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -129,15 +130,30 @@ gtk1210_targetinstall_deps	+= $(STATEDIR)/glib1210.targetinstall
 $(STATEDIR)/gtk1210.targetinstall: $(gtk1210_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-# glib 
-	install $(GTK1210_DIR)/gdk/.libs/libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib
-	ln -sf libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgdk-1.2.so.0
-	ln -sf libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgdk-1.2.so
-
-# gtk
-	install $(GTK1210_DIR)/gtk/.libs/libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib
-	ln -sf libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgtk-1.2.so.0
-	ln -sf libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgtk-1.2.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gtk1210)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GTK1210_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# gdk
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK1210_DIR)/gdk/.libs/libgdk-1.2.so.0.9.1, \
+		/usr/lib/libgdk-1.2.so.0.9.1)
+	@$(call install_link, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so.0)
+	@$(call install_link, libgdk-1.2.so.0.9.1, /usr/lib/libgdk-1.2.so)
+
+	# gtk
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK1210_DIR)/gtk/.libs/libgtk-1.2.so.0.9.1, \
+		/usr/lib/libgtk-1.2.so.0.9.1)
+	@$(call install_link, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so.0)
+	@$(call install_link, libgtk-1.2.so.0.9.1, /usr/lib/libgtk-1.2.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -147,6 +163,7 @@ $(STATEDIR)/gtk1210.targetinstall: $(gtk1210_targetinstall_deps)
 
 gtk1210_clean:
 	rm -rf $(STATEDIR)/gtk1210.*
+	rm -rf $(IMAGEDIR)/gtk1210_*
 	rm -rf $(GTK1210_DIR)
 
 # vim: syntax=make
diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make
index eeb635fcc..f319e6548 100644
--- a/rules/gtk2-engines.make
+++ b/rules/gtk2-engines.make
@@ -122,13 +122,28 @@ gtk2-engines_targetinstall_deps = $(STATEDIR)/gtk2-engines.compile
 
 $(STATEDIR)/gtk2-engines.targetinstall: $(gtk2-engines_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr/lib/engines
-	cp -d $(GTK2-ENGINES_DIR)/metal/.libs/libmetal.so $(ROOTDIR)/usr/lib/engines/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/engines/libmetal.so
-	cp -d $(GTK2-ENGINES_DIR)/redmond95/.libs/libredmond95.so $(ROOTDIR)/usr/lib/engines/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/engines/libredmond95.so
-	cp -d $(GTK2-ENGINES_DIR)/pixbuf/.libs/libpixmap.so $(ROOTDIR)/usr/lib/engines/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/engines/libpixmap.so
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gtk2-engines)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GTK2-ENGINES_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK2-ENGINES_DIR)/metal/.libs/libmetal.so, \
+		/usr/lib/engines/libmetal.so)
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK2-ENGINES_DIR)/redmond95/.libs/libredmond95.so, \
+		/usr/lib/engines/libredmond95.so)
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK2-ENGINES_DIR)/pixbuf/.libs/libpixmap.so, \
+		/usr/lib/engines/libpixmap.so)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -137,6 +152,7 @@ $(STATEDIR)/gtk2-engines.targetinstall: $(gtk2-engines_targetinstall_deps)
 
 gtk2-engines_clean:
 	rm -rf $(STATEDIR)/gtk2-engines.*
+	rm -rf $(IMAGEDIR)/gtk2-engines_*
 	rm -rf $(GTK2-ENGINES_DIR)
 
 # vim: syntax=make
diff --git a/rules/gtk22.make b/rules/gtk22.make
index 872c71c42..5066519a9 100644
--- a/rules/gtk22.make
+++ b/rules/gtk22.make
@@ -55,6 +55,7 @@ $(STATEDIR)/gtk22.extract: $(gtk22_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(GTK22_DIR))
 	@$(call extract, $(GTK22_SOURCE))
+	@$(call patchin, $(GTK22))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -145,24 +146,43 @@ gtk22_targetinstall_deps	+= $(STATEDIR)/pango12.targetinstall
 
 $(STATEDIR)/gtk22.targetinstall: $(gtk22_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,gtk22)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(GTK22_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK22_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.302.0, \
+		/usr/lib/libgtk-x11-2.0.so.0.302.0)
+	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so.0)
+	@$(call install_link, libgtk-x11-2.0.so.0.302.0, /usr/lib/libgtk-x11-2.0.so)
 	
-	install -d $(ROOTDIR)/usr/lib
-	
-	install $(GTK22_DIR)/gtk/.libs/libgtk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib
-	ln -sf libgtk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgtk-x11-2.0.so.0
-	ln -sf libgtk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgtk-x11-2.0.so
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK22_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.302.0, \
+		/usr/lib/libgdk-x11-2.0.so.0.302.0)
+	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so.0)
+	@$(call install_link, libgdk-x11-2.0.so.0.302.0, /usr/lib/libgdk-x11-2.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK22_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.302.0, \
+		/usr/lib/libgdk_pixbuf-2.0.so.0.302.0)
+	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so.0)
+	@$(call install_link, libgdk_pixbuf-2.0.so.0.302.0, /usr/lib/libgdk_pixbuf-2.0.so)
 	
-	install $(GTK22_DIR)/gdk/.libs/libgdk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib
-	ln -sf libgdk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgdk-x11-2.0.so.0
-	ln -sf libgdk-x11-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgdk-x11-2.0.so
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK22_DIR)/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders, \
+		/usr/bin/gdk-pixbuf-query-loaders)
+	@$(call install_copy, 0, 0, 0644, \
+		$(GTK22_DIR)/gdk-pixbuf/.libs/libpixbufloader*so, \
+		/usr/lib/gdk-pixbuf-loaders/)
+
+	@$(call install_finish)
 
-	install $(GTK22_DIR)/gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.0.302.0 $(ROOTDIR)/usr/lib
-	ln -sf libgdk_pixbuf-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgdk_pixbuf-2.0.so.0
-	ln -sf libgdk_pixbuf-2.0.so.0.302.0 $(ROOTDIR)/usr/lib/libgdk_pixbuf-2.0.so
-	
-	install $(GTK22_DIR)/gdk-pixbuf/.libs/gdk-pixbuf-query-loaders $(ROOTDIR)/usr/bin
-	install -d  $(ROOTDIR)/usr/lib/gdk-pixbuf-loaders
-	cp -a  $(GTK22_DIR)/gdk-pixbuf/.libs/libpixbufloader*so $(ROOTDIR)/usr/lib/gdk-pixbuf-loaders
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -171,6 +191,7 @@ $(STATEDIR)/gtk22.targetinstall: $(gtk22_targetinstall_deps)
 
 gtk22_clean:
 	rm -rf $(STATEDIR)/gtk22.*
+	rm -rf $(IMAGEDIR)/gtk22_*
 	rm -rf $(GTK22_DIR)
 
 # vim: syntax=make
diff --git a/rules/ipkg.ipkg b/rules/ipkg.ipkg
deleted file mode 100644
index a8445ed4c..000000000
--- a/rules/ipkg.ipkg
+++ /dev/null
@@ -1,10 +0,0 @@
-Package:	ipkg
-Priority:	optional
-Version:	@VERSION@
-Section:  	base
-Architecture:	@ARCH@
-Maintainer:	Robert Schwebel <r.schwebel@pengutronix.de>
-Depends:	libc6
-Source: 	http://www.pengutronix.de/software/ptxdist_de.html
-Description:	no description yet
-
diff --git a/rules/iptables.make b/rules/iptables.make
index a20f2fa9f..6578cf471 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -117,22 +117,29 @@ iptables_targetinstall_deps = $(STATEDIR)/iptables.compile
 
 $(STATEDIR)/iptables.targetinstall: $(iptables_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,iptables)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(IPTABLES_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
 ifdef $(IPTABLES_INSTALL_IP6TABLES)
-	install -D $(IPTABLES_DIR)/ip6tables $(ROOTDIR)/sbin/ip6tables
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/ip6tables
+	@$(call install_copy, 0, 0, 0755, (IPTABLES_DIR)/ip6tables, /sbin/ip6tables)
 endif
 ifdef $(IPTABLES_INSTALL_IPTABLES)
-	install -D $(IPTABLES_DIR)/iptables $(ROOTDIR)/sbin/iptables
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/iptables
+	@$(call install_copy, 0, 0, 0755, (IPTABLES_DIR)/iptables, /sbin/iptables)
 endif
 ifdef $(IPTABLES_INSTALL_IPTABLES_RESTORE)
-	install -D $(IPTABLES_DIR)/iptables-restore $(ROOTDIR)/sbin/iptables-restore
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/iptables-restore
+	@$(call install_copy, 0, 0, 0755, (IPTABLES_DIR)/iptables-restore, /sbin/iptables-restore)
 endif
 ifdef $(IPTABLES_INSTALL_IPTABLES_SAVE)
-	install -D $(IPTABLES_DIR)/iptables $(ROOTDIR)/sbin/iptables-save
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/iptables
+	@$(call install_copy, 0, 0, 0755, (IPTABLES_DIR)/iptables-save, /sbin/iptables-save)
 endif
+	@$(call install_finish)	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -141,6 +148,7 @@ endif
 
 iptables_clean:
 	rm -rf $(STATEDIR)/iptables.*
+	rm -rf $(IMAGEDIR)/iptables_*
 	rm -rf $(IPTABLES_DIR)
 
 # vim: syntax=make
diff --git a/rules/jed.make b/rules/jed.make
index 2b8fde58d..cf2b0b93b 100644
--- a/rules/jed.make
+++ b/rules/jed.make
@@ -112,6 +112,7 @@ jed_install: $(STATEDIR)/jed.install
 
 $(STATEDIR)/jed.install: $(STATEDIR)/jed.compile
 	@$(call targetinfo, $@)
+	# FIXME: RSC: is it right that this is done on install? 
 	cd $(JED_DIR) && $(JED_ENV) $(JED_PATH) make install
 	touch $@
 
diff --git a/rules/kaffe.make b/rules/kaffe.make
index 81ce9092e..28cd5e16e 100644
--- a/rules/kaffe.make
+++ b/rules/kaffe.make
@@ -28,6 +28,8 @@ KAFFE_SOURCE		= $(SRCDIR)/$(KAFFE).$(KAFFE_SUFFIX)
 KAFFE_DIR		= $(BUILDDIR)/$(KAFFE)
 KAFFE_BUILDDIR		= $(BUILDDIR)/$(KAFFE)-build
 
+# FIXME: RSC: this is probably obsolete, fix
+
 KAFFE_KANGAROO_VERSION	= 0.0.3-user
 KAFFE_KANGAROO		= kangaroo-$(KAFFE_KANGAROO_VERSION)
 KAFFE_KANGAROO_SUFFIX	= tar.gz
@@ -294,18 +296,29 @@ endif
 $(STATEDIR)/kaffe.targetinstall: $(kaffe_targetinstall_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(KAFFE_BUILDDIR)-tmp)
-	mkdir -p $(ROOTDIR)/usr/jre/bin
-	mkdir -p $(ROOTDIR)/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)
 
-	$(KAFFE_PATH) make -C $(KAFFE_BUILDDIR) $(KAFFE_MAKEVARS) \
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,kaffe)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(KAFFE_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, /usr/jre/bin)
+	@$(call install_copy, 0, 0, 0755, /usr/jre/lib/$(PTXCONF_ARCH_USERSPACE))
+
+	cd $(KAFFE_BUILDDIR) && $(KAFFE_PATH) make $(KAFFE_MAKEVARS) \
 		install DESTDIR=$(KAFFE_BUILDDIR)-tmp
 
-	install $(KAFFE_BUILDDIR)-tmp/usr/jre/bin/kaffe-bin \
-		$(ROOTDIR)/usr/jre/bin/kaffe-bin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/jre/bin/kaffe-bin
+	@$(call install_copy, 0, 0, 0755, \
+		$(KAFFE_BUILDDIR)-tmp/usr/jre/bin/kaffe-bin \
+		/usr/jre/bin/kaffe-bin)
 
-	install $(KAFFE_BUILDDIR)-tmp/usr/jre/bin/kaffe \
-		$(ROOTDIR)/usr/jre/bin/kaffe
+	@$(call install_copy, 0, 0, 0755, \
+		$(KAFFE_BUILDDIR)-tmp/usr/jre/bin/kaffe \
+		/usr/jre/bin/kaffe)
 
 	rm -rf $(KAFFE_BUILDDIR)-tmp/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)/libkaffevm.la
 	rm -rf $(KAFFE_BUILDDIR)-tmp/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)/*.a
@@ -322,11 +335,15 @@ ifdef PTXCONF_KAFFE_LINK_BIN
 	rm -rf $(KAFFE_BUILDDIR)-tmp/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)/libkaffevm*
 endif
 
+	# FIXME: ipkgize!
 	cp -av $(KAFFE_BUILDDIR)-tmp/usr/jre/lib/* $(ROOTDIR)/usr/jre/lib/
 	$(CROSS_STRIP) -R .note -R .comment \
 		$(ROOTDIR)/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)/*.so || true
 
 	rm -rf $(KAFFE_BUILDDIR)-tmp
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -334,7 +351,8 @@ endif
 # ----------------------------------------------------------------------------
 
 kaffe_clean:
-	rm -rf $(STATEDIR)/kaffe*
+	rm -rf $(STATEDIR)/kaffe.*
+	rm -rf $(IMAGEDIR)/kaffe_*
 	rm -rf $(KAFFE_DIR)
 	rm -rf $(KAFFE_BUILDDIR)
 	rm -rf $(KAFFE_KANGAROO_DIR)
diff --git a/rules/kernel-ben.make b/rules/kernel-ben.make
deleted file mode 100644
index bbe3a345c..000000000
--- a/rules/kernel-ben.make
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_BEN
-# KERNEL_PATCHES += kernel-ben
-# endif
-
-#
-# Paths and names
-#
-KERNEL_BEN_VERSION	= $(call get_option, s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(ben[0-9]\).*/\1.\2.\3-\4/, benh)
-KERNEL_BEN		= patch-$(KERNEL_BEN_VERSION)
-KERNEL_BEN_SUFFIX	= bz2
-KERNEL_BEN_URL		= http://www.kernel.org/pub/linux/kernel/people/benh/$(KERNEL_BEN).$(KERNEL_BEN_SUFFIX)
-KERNEL_BEN_SOURCE	= $(SRCDIR)/$(KERNEL_BEN).$(KERNEL_BEN_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-ben_get: $(STATEDIR)/kernel-ben.get
-
-kernel-ben_get_deps = \
-	$(KERNEL_BEN_SOURCE)
-
-$(STATEDIR)/kernel-ben.get: $(kernel-ben_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_BEN_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_BEN_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-ben_install: $(STATEDIR)/kernel-ben.install
-
-$(STATEDIR)/kernel-ben.install: $(STATEDIR)/kernel-ben.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_BEN_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-ben_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-dev-epoll.make b/rules/kernel-dev-epoll.make
deleted file mode 100644
index d172857e7..000000000
--- a/rules/kernel-dev-epoll.make
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_DEV-EPOLL
-# KERNEL_PATCHES += kernel-dev-epoll
-# endif
-
-#
-# Paths and names
-#
-KERNEL_DEV-EPOLL_VERSION	= 2.4.18-0.32
-KERNEL_DEV-EPOLL		= ep_patch-$(KERNEL_DEV-EPOLL_VERSION)
-KERNEL_DEV-EPOLL_SUFFIX		= diff
-KERNEL_DEV-EPOLL_URL		= http://www.xmailserver.org/linux-patches/$(KERNEL_DEV-EPOLL).$(KERNEL_DEV-EPOLL_SUFFIX)
-KERNEL_DEV-EPOLL_SOURCE		= $(SRCDIR)/$(KERNEL_DEV-EPOLL).$(KERNEL_DEV-EPOLL_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-dev-epoll_get: $(STATEDIR)/kernel-dev-epoll.get
-
-kernel-dev-epoll_get_deps = \
-	$(KERNEL_DEV-EPOLL_SOURCE)
-
-$(STATEDIR)/kernel-dev-epoll.get: $(kernel-dev-epoll_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_DEV-EPOLL_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_DEV-EPOLL_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-dev-epoll_install: $(STATEDIR)/kernel-dev-epoll.install
-
-$(STATEDIR)/kernel-dev-epoll.install: $(STATEDIR)/kernel-dev-epoll.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_DEV-EPOLL_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-dev-epoll_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
\ No newline at end of file
diff --git a/rules/kernel-ds.make b/rules/kernel-ds.make
deleted file mode 100644
index 9f0325e4b..000000000
--- a/rules/kernel-ds.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_DS
-# KERNEL_PATCHES += kernel-ds
-# endif
-
-#
-# Paths and names
-#
-KERNEL_DS_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(ds[0-9]\).*/\1.\2.\3-\4-\5/, ds)
-KERNEL_DS		= patch-$(KERNEL_DS_VERSION)
-KERNEL_DS_SUFFIX	= gz
-KERNEL_DS_URL		= ftp://source.mvista.com/pub/ds-patches/$(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR)/$(KERNEL_DS).$(KERNEL_DS_SUFFIX)
-KERNEL_DS_SOURCE	= $(SRCDIR)/$(KERNEL_DS).$(KERNEL_DS_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-ds_get: $(STATEDIR)/kernel-ds.get
-
-kernel-ds_get_deps = \
-	$(KERNEL_DS_SOURCE)
-
-$(STATEDIR)/kernel-ds.get: $(kernel-ds_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_DS_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_DS_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-ds_install: $(STATEDIR)/kernel-ds.install
-
-$(STATEDIR)/kernel-ds.install: $(STATEDIR)/kernel-ds.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_DS_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-ds_clean:
-	rm -rf $(STATEDIR)/kernel-ds.*
-
-# vim: syntax=make
diff --git a/rules/kernel-ltt.make b/rules/kernel-ltt.make
deleted file mode 100644
index 0cbfc687c..000000000
--- a/rules/kernel-ltt.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_LTT
-# KERNEL_PATCHES += kernel-ltt
-# endif
-
-#
-# Paths and names
-#
-KERNEL_LTT_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\)_\(ptx[0-9]*\)_\(ltt[0-9]\).*/\1.\2.\3-\4-\5-\7-\8/, ltt)
-KERNEL_LTT		= linux-$(KERNEL_LTT_VERSION)
-KERNEL_LTT_SUFFIX	= diff
-KERNEL_LTT_URL		= http://www.pengutronix.de/software/ltt/$(KERNEL_LTT).$(KERNEL_LTT_SUFFIX)
-KERNEL_LTT_SOURCE	= $(SRCDIR)/$(KERNEL_LTT).$(KERNEL_LTT_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-ltt_get: $(STATEDIR)/kernel-ltt.get
-
-kernel-ltt_get_deps = \
-	$(KERNEL_LTT_SOURCE)
-
-$(STATEDIR)/kernel-ltt.get: $(kernel-ltt_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_LTT_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_LTT_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-ltt_install: $(STATEDIR)/kernel-ltt.install
-
-$(STATEDIR)/kernel-ltt.install: $(STATEDIR)/kernel-ltt.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_LTT_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-ltt_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-mtd.make b/rules/kernel-mtd.make
deleted file mode 100644
index 911b68c5f..000000000
--- a/rules/kernel-mtd.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_MTD
-# KERNEL_PATCHES += kernel-mtd
-# endif
-
-#
-# Paths and names
-#
-KERNEL_MTD_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\).*/\1.\2.\3-\4-\5-\6/, mtd)
-KERNEL_MTD		= linux-$(KERNEL_MTD_VERSION)
-KERNEL_MTD_SUFFIX	= diff.bz2
-KERNEL_MTD_URL		= http://www.pengutronix.de/software/linux-arm/$(KERNEL_MTD).$(KERNEL_MTD_SUFFIX)
-KERNEL_MTD_SOURCE	= $(SRCDIR)/linux-$(KERNEL_MTD_VERSION).$(KERNEL_MTD_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-mtd_get: $(STATEDIR)/kernel-mtd.get
-
-kernel-mtd_get_deps = \
-	$(KERNEL_MTD_SOURCE)
-
-$(STATEDIR)/kernel-mtd.get: $(kernel-mtd_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_MTD_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_MTD_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-mtd_install: $(STATEDIR)/kernel-mtd.install
-
-$(STATEDIR)/kernel-mtd.install: $(STATEDIR)/kernel-mtd.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_MTD_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-mtd_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-ptx.make b/rules/kernel-ptx.make
deleted file mode 100644
index 095cfb271..000000000
--- a/rules/kernel-ptx.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_PTX
-# KERNEL_PATCHES += kernel-ptx
-# endif
-
-#
-# Paths and names
-#
-KERNEL_PTX_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\)_\(ptx[0-9]*\).*/\1.\2.\3-\4-\5-\7/, ptx)
-KERNEL_PTX		= linux-$(KERNEL_PTX_VERSION)
-KERNEL_PTX_SUFFIX	= diff
-KERNEL_PTX_URL		= http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTX).$(KERNEL_PTX_SUFFIX)
-KERNEL_PTX_SOURCE	= $(SRCDIR)/$(KERNEL_PTX).$(KERNEL_PTX_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-ptx_get: $(STATEDIR)/kernel-ptx.get
-
-kernel-ptx_get_deps = \
-	$(KERNEL_PTX_SOURCE)
-
-$(STATEDIR)/kernel-ptx.get: $(kernel-ptx_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_PTX_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_PTX_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-ptx_install: $(STATEDIR)/kernel-ptx.install
-
-$(STATEDIR)/kernel-ptx.install: $(STATEDIR)/kernel-ptx.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_PTX_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-ptx_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-pxa.make b/rules/kernel-pxa.make
deleted file mode 100644
index 344702454..000000000
--- a/rules/kernel-pxa.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_PXA
-# KERNEL_PATCHES += kernel-pxa
-# endif
-
-#
-# Paths and names
-#
-KERNEL_PXA_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\).*/\1.\2.\3-\4-\5/, pxa)
-KERNEL_PXA		= diff-$(KERNEL_PXA_VERSION)
-KERNEL_PXA_SUFFIX	= gz
-KERNEL_PXA_URL		= ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXA).$(KERNEL_PXA_SUFFIX)
-KERNEL_PXA_SOURCE	= $(SRCDIR)/$(KERNEL_PXA).$(KERNEL_PXA_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-pxa_get: $(STATEDIR)/kernel-pxa.get
-
-kernel-pxa_get_deps = \
-	$(KERNEL_PXA_SOURCE)
-
-$(STATEDIR)/kernel-pxa.get: $(kernel-pxa_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_PXA_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_PXA_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-pxa_install: $(STATEDIR)/kernel-pxa.install
-
-$(STATEDIR)/kernel-pxa.install: $(STATEDIR)/kernel-pxa.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_PXA_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-pxa_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-rmk.make b/rules/kernel-rmk.make
deleted file mode 100644
index efc683275..000000000
--- a/rules/kernel-rmk.make
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_RMK
-# KERNEL_PATCHES += kernel-rmk
-# endif
-
-#
-# Paths and names
-#
-KERNEL_RMK_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\).*/\1.\2.\3-\4/, rmk)
-KERNEL_RMK		= patch-$(KERNEL_RMK_VERSION)
-KERNEL_RMK_SUFFIX	= bz2
-KERNEL_RMK_URL		= ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v$(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR)/$(KERNEL_RMK).$(KERNEL_RMK_SUFFIX)
-KERNEL_RMK_SOURCE	= $(SRCDIR)/$(KERNEL_RMK).$(KERNEL_RMK_SUFFIX)
-
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-rmk_get: $(STATEDIR)/kernel-rmk.get
-
-kernel-rmk_get_deps = \
-	$(KERNEL_RMK_SOURCE)
-
-$(STATEDIR)/kernel-rmk.get: $(kernel-rmk_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_RMK_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_RMK_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-rmk_install: $(STATEDIR)/kernel-rmk.install
-
-$(STATEDIR)/kernel-rmk.install: $(STATEDIR)/kernel-rmk.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_RMK_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-rmk_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-rtai.make b/rules/kernel-rtai.make
deleted file mode 100644
index 7ec6c1bcd..000000000
--- a/rules/kernel-rtai.make
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_RTAI
-# KERNEL_PATCHES += kernel-rtai
-# endif
-
-#
-# Paths and names
-#
-KERNEL_RTAI_VERSION	= $(RTAI_VERSION_RELEASE)
-KERNEL_RTAI_SUFFIX	= tgz
-KERNEL_RTAI_PATCH	= $(KERNEL_RTAI_DIR)/patches/patch-$(KERNEL_VERSION)-$(RTAI_TECH)
-KERNEL_RTAI_SOURCE	= $(SRCDIR)/$(KERNEL_RTAI).$(KERNEL_RTAI_SUFFIX)
-KERNEL_RTAI		= rtai-$(KERNEL_RTAI_VERSION)
-KERNEL_RTAI_DIR		= $(PATCHES_BUILDDIR)/$(KERNEL_RTAI)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-rtai_get: $(STATEDIR)/kernel-rtai.get
-
-$(STATEDIR)/kernel-rtai.get: $(KERNEL_RTAI_SOURCE)
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-kernel-rtai_extract: $(STATEDIR)/kernel-rtai.extract
-
-$(STATEDIR)/kernel-rtai.extract: $(STATEDIR)/kernel-rtai.get
-	@$(call targetinfo, $@)
-	@$(call clean, $(KERNEL_RTAI_DIR))
-	@$(call extract, $(KERNEL_RTAI_SOURCE), $(PATCHES_BUILDDIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-rtai_install: $(STATEDIR)/kernel-rtai.install
-
-$(STATEDIR)/kernel-rtai.install: $(STATEDIR)/kernel-rtai.extract
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_RTAI_PATCH), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-rtai_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-sys-epoll.make b/rules/kernel-sys-epoll.make
deleted file mode 100644
index 5d41062e0..000000000
--- a/rules/kernel-sys-epoll.make
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_SYS-EPOLL
-# KERNEL_PATCHES += kernel-sys-epoll
-# endif
-
-#
-# Paths and names
-#
-ifeq ($(KERNEL_VERSION),2.4.20)
-KERNEL_SYS-EPOLL_VERSION	= 2.4.20-0.61
-KERNEL_SYS-EPOLL		= sys_epoll-$(KERNEL_SYS-EPOLL_VERSION)
-endif
-
-ifeq ($(KERNEL_VERSION),2.4.21)
-KERNEL_SYS-EPOLL_VERSION	= 2.4.21-0.18
-KERNEL_SYS-EPOLL		= epoll-lt-$(KERNEL_SYS-EPOLL_VERSION)
-endif
-
-KERNEL_SYS-EPOLL_SUFFIX		= diff
-KERNEL_SYS-EPOLL_URL		= http://www.xmailserver.org/linux-patches/$(KERNEL_SYS-EPOLL).$(KERNEL_SYS-EPOLL_SUFFIX)
-KERNEL_SYS-EPOLL_SOURCE		= $(SRCDIR)/$(KERNEL_SYS-EPOLL).$(KERNEL_SYS-EPOLL_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-sys-epoll_get: $(STATEDIR)/kernel-sys-epoll.get
-
-kernel-sys-epoll_get_deps = \
-	$(KERNEL_SYS-EPOLL_SOURCE)
-
-$(STATEDIR)/kernel-sys-epoll.get: $(kernel-sys-epoll_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_SYS-EPOLL_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_SYS-EPOLL_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-sys-epoll_install: $(STATEDIR)/kernel-sys-epoll.install
-
-$(STATEDIR)/kernel-sys-epoll.install: $(STATEDIR)/kernel-sys-epoll.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_SYS-EPOLL_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-sys-epoll_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/kernel-uc.make b/rules/kernel-uc.make
deleted file mode 100644
index 9f5a3ccf8..000000000
--- a/rules/kernel-uc.make
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*-makefile-*-
-# $Id$
-#
-# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# ifdef PTXCONF_KERNEL_UC
-# KERNEL_PATCHES += kernel-uc
-# endif
-
-#
-# Paths and names
-#
-KERNEL_UC_VERSION	= $(call get_option, \
-	s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(uc[0-9]\).*/\1.\2.\3-\4/, uc)
-KERNEL_UC		= uClinux-$(KERNEL_UC_VERSION)
-KERNEL_UC_SUFFIX	= diff.gz
-KERNEL_UC_URL		= http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/$(KERNEL_UC).$(KERNEL_UC_SUFFIX)
-KERNEL_UC_SOURCE	= $(SRCDIR)/$(KERNEL_UC).$(KERNEL_UC_SUFFIX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-kernel-uc_get: $(STATEDIR)/kernel-uc.get
-
-kernel-uc_get_deps = \
-	$(KERNEL_UC_SOURCE)
-
-$(STATEDIR)/kernel-uc.get: $(kernel-uc_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(KERNEL_UC_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(KERNEL_UC_URL))
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-kernel-uc_install: $(STATEDIR)/kernel-uc.install
-
-$(STATEDIR)/kernel-uc.install: $(STATEDIR)/kernel-uc.get
-	@$(call targetinfo, $@)
-	@$(call patch_apply, $(KERNEL_UC_SOURCE), $(KERNEL_DIR))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-kernel-uc_clean:
-	rm -rf $(STATEDIR)/kernel*
-
-# vim: syntax=make
diff --git a/rules/konq-e.make b/rules/konq-e.make
index a37ffe554..eefb92209 100644
--- a/rules/konq-e.make
+++ b/rules/konq-e.make
@@ -54,6 +54,7 @@ $(STATEDIR)/konq-e.extract: $(konq-e_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(KONQ-E_DIR))
 	@$(call extract, $(KONQ-E_SOURCE))
+	@$(call patchin, $(KONQ-E))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -98,7 +99,7 @@ konq-e_compile_deps =  $(STATEDIR)/konq-e.prepare
 
 $(STATEDIR)/konq-e.compile: $(konq-e_compile_deps)
 	@$(call targetinfo, $@)
-	$(KONQ-E_PATH) $(KONQ-E_ENV) make -C $(KONQ-E_DIR)
+	cd $(KONQ-E_DIR) && $(KONQ-E_PATH) $(KONQ-E_ENV) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -109,7 +110,8 @@ konq-e_install: $(STATEDIR)/konq-e.install
 
 $(STATEDIR)/konq-e.install: $(STATEDIR)/konq-e.compile
 	@$(call targetinfo, $@)
-	$(KONQ-E_PATH) $(KONQ-E_ENV) make -C $(KONQ-E_DIR) install
+	# FIXME: RSC: shouldn't this be target-install? 
+	cd $(KONQ-E_DIR) && $(KONQ-E_PATH) $(KONQ-E_ENV) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make
index d5724df88..15ef42f45 100644
--- a/rules/libIDL-2.make
+++ b/rules/libIDL-2.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: is this a hosttool? 
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/libidl-2.extract: $(libidl-2_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBIDL-2_DIR))
 	@$(call extract, $(LIBIDL-2_SOURCE))
+	@$(call patchin, $(LIBIDL-2))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -131,6 +134,7 @@ libidl-2_targetinstall_deps	=  $(STATEDIR)/libidl-2.compile
 
 $(STATEDIR)/libidl-2.targetinstall: $(libidl-2_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: nothing to do? 
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libIDL068.make b/rules/libIDL068.make
index 1414da4a7..a18dd7bde 100644
--- a/rules/libIDL068.make
+++ b/rules/libIDL068.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: is this a hosttool? 
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/libidl068.extract: $(libidl068_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBIDL068_DIR))
 	@$(call extract, $(LIBIDL068_SOURCE))
+	@$(call patchin, $(LIBIDL068))
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libart.make b/rules/libart.make
index efa2d3a38..e9213cf36 100644
--- a/rules/libart.make
+++ b/rules/libart.make
@@ -54,6 +54,7 @@ $(STATEDIR)/libart.extract: $(libart_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBART_DIR))
 	@$(call extract, $(LIBART_SOURCE))
+	@$(call patchin, $(LIBART))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -123,12 +124,23 @@ libart_targetinstall_deps = $(STATEDIR)/libart.compile
 $(STATEDIR)/libart.targetinstall: $(libart_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)/usr/lib
-        
-	install $(LIBART_DIR)/.libs/libart_lgpl_2.so.2.3.16 $(ROOTDIR)/usr/lib
-	ln -sf libart_lgpl_2.so.2.3.16 $(ROOTDIR)/usr/lib/libart_lgpl_2.so.2.3
-	ln -sf libart_lgpl_2.so.2.3.16 $(ROOTDIR)/usr/lib/libart_lgpl_2.so.2
-	ln -sf libart_lgpl_2.so.2.3.16 $(ROOTDIR)/usr/lib/libart_lgpl_2.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,libart)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LIBART_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(LIBART_DIR)/.libs/libart_lgpl_2.so.2.3.16, \
+		/usr/lib/libart_lgpl_2.so.2.3.16)
+	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2.3)
+	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so.2)
+	@$(call install_link, libart_lgpl_2.so.2.3.16, /usr/lib/libart_lgpl_2.so)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -138,6 +150,7 @@ $(STATEDIR)/libart.targetinstall: $(libart_targetinstall_deps)
 
 libart_clean:
 	rm -rf $(STATEDIR)/libart.*
+	rm -rf $(IMAGEDIR)/libart_*
 	rm -rf $(LIBART_DIR)
 
 # vim: syntax=make
diff --git a/rules/libgd.make b/rules/libgd.make
index 82358c594..da94b871f 100644
--- a/rules/libgd.make
+++ b/rules/libgd.make
@@ -22,9 +22,9 @@ endif
 LIBGD_VERSION	= 2.0.15
 LIBGD		= gd-$(LIBGD_VERSION)
 LIBGD_SUFFIX	= tar.gz
-LIBGD_URL		= http://www.boutell.com/gd/http/$(LIBGD).$(LIBGD_SUFFIX)
+LIBGD_URL	= http://www.boutell.com/gd/http/$(LIBGD).$(LIBGD_SUFFIX)
 LIBGD_SOURCE	= $(SRCDIR)/$(LIBGD).$(LIBGD_SUFFIX)
-LIBGD_DIR		= $(BUILDDIR)/$(LIBGD)
+LIBGD_DIR	= $(BUILDDIR)/$(LIBGD)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -54,6 +54,7 @@ $(STATEDIR)/libgd.extract: $(libgd_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBGD_DIR))
 	@$(call extract, $(LIBGD_SOURCE))
+	@$(call patchin, $(LIBGD))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -111,6 +112,7 @@ libgd_install: $(STATEDIR)/libgd.install
 
 $(STATEDIR)/libgd.install: $(STATEDIR)/libgd.compile
 	@$(call targetinfo, $@)
+	# FIXME: is this a hosttool? 
 	$(LIBGD_PATH) $(LIBGD_ENV) make -C $(LIBGD_DIR) install
 	touch $@
 
diff --git a/rules/libglade.make b/rules/libglade.make
index 63268f7af..4c3de1589 100644
--- a/rules/libglade.make
+++ b/rules/libglade.make
@@ -54,6 +54,7 @@ $(STATEDIR)/libglade.extract: $(libglade_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBGLADE_DIR))
 	@$(call extract, $(LIBGLADE_SOURCE))
+	@$(call patchin, $(LIBGLADE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -99,7 +100,7 @@ libglade_compile_deps = $(STATEDIR)/libglade.prepare
 
 $(STATEDIR)/libglade.compile: $(libglade_compile_deps)
 	@$(call targetinfo, $@)
-	$(LIBGLADE_PATH) make -C $(LIBGLADE_DIR)
+	cd $(LIBGLADE_DIR) && $(LIBGLADE_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,7 +111,8 @@ libglade_install: $(STATEDIR)/libglade.install
 
 $(STATEDIR)/libglade.install: $(STATEDIR)/libglade.compile
 	@$(call targetinfo, $@)
-	$(LIBGLADE_PATH) make -C $(LIBGLADE_DIR) install
+	# FIXME: this is not a hosttool -> targetinstall? 
+	cd $(LIBGLADE_DIR) && $(LIBGLADE_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -131,6 +133,7 @@ $(STATEDIR)/libglade.targetinstall: $(libglade_targetinstall_deps)
 
 libglade_clean:
 	rm -rf $(STATEDIR)/libglade.*
+	rm -rf $(IMAGEDIR)/libglade_*
 	rm -rf $(LIBGLADE_DIR)
 
 # vim: syntax=make
diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make
index 3a51e9363..c9220322d 100644
--- a/rules/libgnomecanvas.make
+++ b/rules/libgnomecanvas.make
@@ -54,6 +54,7 @@ $(STATEDIR)/libgnomecanvas.extract: $(libgnomecanvas_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBGNOMECANVAS_DIR))
 	@$(call extract, $(LIBGNOMECANVAS_SOURCE))
+	@$(call patchin, $(LIBGNOMECANVAS))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -127,11 +128,22 @@ libgnomecanvas_targetinstall_deps = $(STATEDIR)/libart.targetinstall
 $(STATEDIR)/libgnomecanvas.targetinstall: $(libgnomecanvas_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)/usr/lib
-        
-	install $(LIBGNOMECANVAS_DIR)/libgnomecanvas/.libs/libgnomecanvas-2.so.0.590.0 $(ROOTDIR)/usr/lib
-	ln -sf libgnomecanvas-2.so.0.590.0 $(ROOTDIR)/usr/lib/libgnomecanvas-2.so.0
-	ln -sf libgnomecanvas-2.so.0.590.0 $(ROOTDIR)/usr/lib/libgnomecanvas-2.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,libgnomecanvas)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LIBGNOMECANVAS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+       
+	@$(call install_copy, 0, 0, 0644, \
+		$(LIBGNOMECANVAS_DIR)/libgnomecanvas/.libs/libgnomecanvas-2.so.0.590.0, \
+		/usr/lib/libgnomecanvas-2.so.0.590.0)
+	@$(call install_link, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so.0)
+	@$(call install_link, libgnomecanvas-2.so.0.590.0, /usr/lib/libgnomecanvas-2.so)
+	
+	@$(call install_finish)
 
 	touch $@
 
@@ -141,6 +153,7 @@ $(STATEDIR)/libgnomecanvas.targetinstall: $(libgnomecanvas_targetinstall_deps)
 
 libgnomecanvas_clean:
 	rm -rf $(STATEDIR)/libgnomecanvas.*
+	rm -rf $(IMAGEDIR)/libgnomecanvas_*
 	rm -rf $(LIBGNOMECANVAS_DIR)
 
 # vim: syntax=make
diff --git a/rules/libnet.make b/rules/libnet.make
index f0cff5541..93a46d296 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -59,6 +59,7 @@ $(STATEDIR)/libnet.extract: $(libnet_extract_deps)
 	@$(call clean, $(LIBNET_DIR))
 	@$(call extract, $(LIBNET_SOURCE))
 	@$(call patchin, $(LIBNET), $(LIBNET_DIR))
+	# FIXME: run this with well defined version!
 	cd $(LIBNET_DIR) && \
 		$(PTXCONF_PREFIX)/$(AUTOMAKE15)/bin/aclocal && \
 		$(PTXCONF_PREFIX)/$(AUTOMAKE15)/bin/automake && \
@@ -108,7 +109,7 @@ libnet_compile_deps =  $(STATEDIR)/libnet.prepare
 
 $(STATEDIR)/libnet.compile: $(libnet_compile_deps)
 	@$(call targetinfo, $@)
-	$(LIBNET_PATH) $(LIBNET_ENV) make -C $(LIBNET_DIR)
+	cd $(LIBNET_DIR) && $(LIBNET_PATH) $(LIBNET_ENV) make -C
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -119,7 +120,7 @@ libnet_install: $(STATEDIR)/libnet.install
 
 $(STATEDIR)/libnet.install: $(STATEDIR)/libnet.compile
 	@$(call targetinfo, $@)
-	$(LIBNET_PATH) $(LIBNET_ENV) make -C $(LIBNET_DIR) install
+	cd $(LIBNET_DIR) && $(LIBNET_PATH) $(LIBNET_ENV) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -132,6 +133,7 @@ libnet_targetinstall_deps	=  $(STATEDIR)/libnet.install
 
 $(STATEDIR)/libnet.targetinstall: $(libnet_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: nothing to do? 
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -140,6 +142,7 @@ $(STATEDIR)/libnet.targetinstall: $(libnet_targetinstall_deps)
 
 libnet_clean:
 	rm -rf $(STATEDIR)/libnet.*
+	rm -rf $(IMAGEDIR)/libnet_*
 	rm -rf $(LIBNET_DIR)
 
 # vim: syntax=make
diff --git a/rules/liboop.make b/rules/liboop.make
index 5dfc16ccc..48d906370 100644
--- a/rules/liboop.make
+++ b/rules/liboop.make
@@ -54,6 +54,7 @@ $(STATEDIR)/liboop.extract: $(liboop_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBOOP_DIR))
 	@$(call extract, $(LIBOOP_SOURCE))
+	@$(call patchin, $(LIBOOP))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -103,7 +104,7 @@ liboop_compile_deps = $(STATEDIR)/liboop.prepare
 
 $(STATEDIR)/liboop.compile: $(liboop_compile_deps)
 	@$(call targetinfo, $@)
-	$(LIBOOP_PATH) make -C $(LIBOOP_DIR)
+	cd $(LIBOOP_DIR) && $(LIBOOP_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -114,7 +115,7 @@ liboop_install: $(STATEDIR)/liboop.install
 
 $(STATEDIR)/liboop.install: $(STATEDIR)/liboop.compile
 	@$(call targetinfo, $@)
-	$(LIBOOP_PATH) make -C $(LIBOOP_DIR) install
+	cd $(LIBOOP_DIR) && $(LIBOOP_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -127,9 +128,21 @@ liboop_targetinstall_deps = $(STATEDIR)/liboop.compile
 
 $(STATEDIR)/liboop.targetinstall: $(liboop_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/lib
-	cp -a $(PTXCONF_PREFIX)/lib/liboop.so* $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/liboop.so*
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,liboop)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LIBOOP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: wildcard copy
+	@$(call install_copy, 0, 0, 0644, $(PTXCONF_PREFIX)/lib/liboop.so*, /usr/lib/)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -138,6 +151,7 @@ $(STATEDIR)/liboop.targetinstall: $(liboop_targetinstall_deps)
 
 liboop_clean:
 	rm -rf $(STATEDIR)/liboop.*
+	rm -rf $(IMAGEDIR)/liboop_*
 	rm -rf $(LIBOOP_DIR)
 
 # vim: syntax=make
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 5520987a3..78efde65f 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -54,6 +54,7 @@ $(STATEDIR)/libpcap.extract: $(libpcap_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBPCAP_DIR))
 	@$(call extract, $(LIBPCAP_SOURCE))
+	@$(call patchin, $(LIBPCAP_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -74,7 +75,6 @@ LIBPCAP_ENV = \
 	$(CROSS_ENV) \
 	ac_cv_linux_vers=2
 
-
 #
 # autoconf
 #
@@ -111,6 +111,7 @@ libpcap_install: $(STATEDIR)/libpcap.install
 
 $(STATEDIR)/libpcap.install: $(STATEDIR)/libpcap.compile
 	@$(call targetinfo, $@)
+	# FIXME: shoudldn' that run on targetinstall? 
 	cd $(LIBPCAP_DIR) && $(LIBPCAP_PATH) make install
 	touch $@
 
diff --git a/rules/libpng125.make b/rules/libpng125.make
index 0d732b982..b7a9f0572 100644
--- a/rules/libpng125.make
+++ b/rules/libpng125.make
@@ -129,10 +129,24 @@ libpng125_targetinstall_deps	=  $(STATEDIR)/libpng125.compile
 
 $(STATEDIR)/libpng125.targetinstall: $(libpng125_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/lib
-	install $(LIBPNG125_DIR)/libpng12.so.0.1.2.5 $(ROOTDIR)/lib
-	ln -sf libpng12.so.0.1.2.5 $(ROOTDIR)/lib/libpng12.so.0
-	ln -sf libpng12.so.0.1.2.5 $(ROOTDIR)/lib/libpng12.so
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,libpng125)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LIBPNG125_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0644, \
+		$(LIBPNG125_DIR)/libpng12.so.0.1.2.5, \
+		/usr/lib/libpng12.so.0.1.2.5)
+	@$(call install_link, libpng12.so.0.1.2.5, /usr/lib/libpng12.so.0)
+	@$(call install_link, libpng12.so.0.1.2.5, /usr/lib/libpng12.so)
+	
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -141,6 +155,7 @@ $(STATEDIR)/libpng125.targetinstall: $(libpng125_targetinstall_deps)
 
 libpng125_clean:
 	rm -rf $(STATEDIR)/libpng125.*
+	rm -rf $(IMAGEDIR)/libpng125_*
 	rm -rf $(LIBPNG125_DIR)
 
 # vim: syntax=make
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 13be0fd18..9ae8e3690 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -21,10 +21,10 @@ endif
 #
 LIBXML2_VERSION	= 2.6.2
 LIBXML2		= libxml2-$(LIBXML2_VERSION)
-LIBXML2_SUFFIX		= tar.bz2
-LIBXML2_URL		= ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6//$(LIBXML2).$(LIBXML2_SUFFIX)
-LIBXML2_SOURCE		= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
-LIBXML2_DIR		= $(BUILDDIR)/$(LIBXML2)
+LIBXML2_SUFFIX	= tar.bz2
+LIBXML2_URL	= ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6//$(LIBXML2).$(LIBXML2_SUFFIX)
+LIBXML2_SOURCE	= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
+LIBXML2_DIR	= $(BUILDDIR)/$(LIBXML2)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -54,6 +54,7 @@ $(STATEDIR)/libxml2.extract: $(libxml2_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBXML2_DIR))
 	@$(call extract, $(LIBXML2_SOURCE))
+	@$(call patchin, $(LIBXML2))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -99,7 +100,7 @@ libxml2_compile_deps = $(STATEDIR)/libxml2.prepare
 
 $(STATEDIR)/libxml2.compile: $(libxml2_compile_deps)
 	@$(call targetinfo, $@)
-	$(LIBXML2_PATH) make -C $(LIBXML2_DIR)
+	cd $(LIBXML2_DIR) && $(LIBXML2_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,7 +111,7 @@ libxml2_install: $(STATEDIR)/libxml2.install
 
 $(STATEDIR)/libxml2.install: $(STATEDIR)/libxml2.compile
 	@$(call targetinfo, $@)
-	$(LIBXML2_PATH) make -C $(LIBXML2_DIR) install
+	cd $(LIBXML2_DIR) && $(LIBXML2_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -124,9 +125,23 @@ libxml2_targetinstall_deps = $(STATEDIR)/libxml2.compile \
 
 $(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr/lib
-	cp -d $(LIBXML2_DIR)/.libs/libxml2.so* $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libxml2.so*
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,libxml2)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LIBXML2_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	# FIXME: wildcard copy? 
+	@$(call install_copy, 0, 0, 0644, \
+		$(LIBXML2_DIR)/.libs/libxml2.so*, \
+		/usr/lib/)
+	
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -135,6 +150,7 @@ $(STATEDIR)/libxml2.targetinstall: $(libxml2_targetinstall_deps)
 
 libxml2_clean:
 	rm -rf $(STATEDIR)/libxml2.*
+	rm -rf $(IMAGEDIR)/libxml2_*
 	rm -rf $(LIBXML2_DIR)
 
 # vim: syntax=make
diff --git a/rules/lilo.make b/rules/lilo.make
index 4383908bc..1f524f9cb 100644
--- a/rules/lilo.make
+++ b/rules/lilo.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: nothing to do? 
+
 #
 # We provide this package
 #
@@ -19,7 +21,8 @@ endif
 #
 # Paths and names 
 #
-LILO		= lilo-22.5.9
+LILO_VERSION	= 22.5.9
+LILO		= lilo-$(LILO_VERSION)
 LILO_URL	= http://home.san.rr.com/johninsd/pub/linux/lilo/$(LILO).tar.gz
 LILO_SOURCE	= $(SRCDIR)/$(LILO).tar.gz
 LILO_DIR	= $(BUILDDIR)/$(LILO)
@@ -50,6 +53,7 @@ $(STATEDIR)/lilo.extract: $(STATEDIR)/lilo.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(LILO_DIR))
 	@$(call extract, $(LILO_SOURCE))
+	@$(call patchin, $(LILO))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -82,7 +86,7 @@ lilo_compile_deps =  $(STATEDIR)/lilo.prepare
 
 $(STATEDIR)/lilo.compile: $(lilo_compile_deps) 
 	@$(call targetinfo, $@)
-	$(LILO_PATH) make -C $(LILO_DIR) $(LILO_MAKEVARS)
+	cd $(LILO_DIR) && $(LILO_PATH) make $(LILO_MAKEVARS)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,7 +114,8 @@ $(STATEDIR)/lilo.targetinstall: $(STATEDIR)/lilo.install
 # ----------------------------------------------------------------------------
 
 lilo_clean:
-	-rm -rf $(STATEDIR)/lilo*
-	-rm -rf $(LILO_DIR)
+	rm -rf $(STATEDIR)/lilo.*
+	rm -rf $(IMAGEDIR)/lilo_*
+	rm -rf $(LILO_DIR)
 
 # vim: syntax=make
diff --git a/rules/lrzsz.make b/rules/lrzsz.make
index e5161889f..76c432b29 100644
--- a/rules/lrzsz.make
+++ b/rules/lrzsz.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: this packet does nothing. 
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/lrzsz.extract: $(lrzsz_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LSZRZ_DIR))
 	@$(call extract, $(LSZRZ_SOURCE))
+	@$(call patchin, $(LSZRZ))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -97,7 +100,7 @@ lrzsz_compile_deps =  $(STATEDIR)/lrzsz.prepare
 
 $(STATEDIR)/lrzsz.compile: $(lrzsz_compile_deps)
 	@$(call targetinfo, $@)
-	$(LSZRZ_PATH) make -C $(LSZRZ_DIR)
+	cd $(LSZRZ_DIR) && $(LSZRZ_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -128,6 +131,7 @@ $(STATEDIR)/lrzsz.targetinstall: $(lrzsz_targetinstall_deps)
 
 lrzsz_clean:
 	rm -rf $(STATEDIR)/lrzsz.*
+	rm -rf $(IMAGEDIR)/lrzsz_*
 	rm -rf $(LSZRZ_DIR)
 
 # vim: syntax=make
diff --git a/rules/lsh.make b/rules/lsh.make
index ed7f5c4ce..d04062176 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -145,38 +145,38 @@ lsh_targetinstall_deps = \
 $(STATEDIR)/lsh.targetinstall: $(lsh_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	mkdir -p $(ROOTDIR)/sbin
-	mkdir -p $(ROOTDIR)/bin
-	mkdir -p $(ROOTDIR)/var/spool/lsh
-
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,lsh)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LSH_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: use build paths
 ifdef PTXCONF_LSH_EXECUV
-	install $(PTXCONF_PREFIX)/sbin/lsh-execuv $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-execuv 
+	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/sbin/lsh-execuv, /sbin/lsh-execuv)
 endif
 ifdef PTXCONF_LSH_PROXY
-	install $(PTXCONF_PREFIX)/sbin/lsh_proxy $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh_proxy 
+	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/sbin/lsh_proxy, /sbin/lsh_proxy)
 endif
 ifdef PTXCONF_LSH_LSHD
-	install $(LSH_DIR)/src/lshd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lshd 
+	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lshd, /sbin/lshd)
 endif
 ifdef PTXCONF_LSH_SFTPD
-	install $(PTXCONF_PREFIX)/sbin/sftp-server $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/sftp-server
+	@$(call install_copy, 0, 0, 0755, $(PTXCONF_PREFIX)/sbin/sftp-server, /sbin/sftp-server)
 endif
 ifdef PTXCONF_LSH_MAKESEED
-	install $(LSH_DIR)/src/lsh-make-seed $(ROOTDIR)/bin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/lsh-make-seed
+	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-make-seed, /bin/lsh-make-seed)
 endif
 ifdef PTXCONF_LSH_WRITEKEY
-	install $(LSH_DIR)/src/lsh-writekey $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-writekey
+	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-writekey, /sbin/lsh-writekey)
 endif
 ifdef PTXCONF_LSH_KEYGEN
-	install $(LSH_DIR)/src/lsh-keygen $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lsh-keygen
+	@$(call install_copy, 0, 0, 0755, $(LSH_DIR)/src/lsh-keygen, /sbin/lsh-keygen)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -185,6 +185,7 @@ endif
 
 lsh_clean:
 	rm -rf $(STATEDIR)/lsh.*
+	rm -rf $(IMAGEDIR)/lsh_*
 	rm -rf $(LSH_DIR)
 
 # vim: syntax=make
diff --git a/rules/ltt.make b/rules/ltt.make
index dec6e3e5c..9edff74fe 100644
--- a/rules/ltt.make
+++ b/rules/ltt.make
@@ -129,13 +129,30 @@ ltt_targetinstall: $(STATEDIR)/ltt.targetinstall
 
 $(STATEDIR)/ltt.targetinstall: $(STATEDIR)/ltt.install
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr/sbin
 
-	install $(LTT_BUILDDIR)/Daemon/tracedaemon $(ROOTDIR)/usr/sbin
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/tracedaemon
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,ltt)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(LTT_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, \
+		$(LTT_BUILDDIR)/Daemon/tracedaemon, \
+		/usr/sbin/tracedaemon)
+	@$(call install_copy, 0, 0, 0755, \
+		$(LTT_DIR)/createdev.sh, \
+		/usr/sbin/tracecreatedev, n)
+
+	# FIXME: wildcard copy
+	@$(call install_copy, 0, 0, 0755, \
+		$(LTT_DIR)/Daemon/Scripts/trace*, \
+		/usr/sbin)
+
+	@$(call install_finish)
 
-	install $(LTT_DIR)/createdev.sh $(ROOTDIR)/usr/sbin/tracecreatedev
-	cp $(LTT_DIR)/Daemon/Scripts/trace* $(ROOTDIR)/usr/sbin
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -143,6 +160,8 @@ $(STATEDIR)/ltt.targetinstall: $(STATEDIR)/ltt.install
 # ----------------------------------------------------------------------------
 
 ltt_clean: 
-	rm -rf $(STATEDIR)/ltt.* $(LTT_DIR)
+	rm -rf $(STATEDIR)/ltt.* 
+	rm -rf $(IMAGEDIR)/ltt_* 
+	rm -rf $(LTT_DIR)
 
 # vim: syntax=make
diff --git a/rules/mad.make b/rules/mad.make
index 0913d24cd..15cc70620 100644
--- a/rules/mad.make
+++ b/rules/mad.make
@@ -54,6 +54,7 @@ $(STATEDIR)/mad.extract: $(mad_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(MAD_DIR))
 	@$(call extract, $(MAD_SOURCE))
+	@$(call patchin, $(MAD_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -96,7 +97,7 @@ mad_compile_deps = $(STATEDIR)/mad.prepare
 
 $(STATEDIR)/mad.compile: $(mad_compile_deps)
 	@$(call targetinfo, $@)
-	$(MAD_PATH) make -C $(MAD_DIR)
+	cd $(MAD_DIR) && $(MAD_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -119,8 +120,19 @@ mad_targetinstall_deps = $(STATEDIR)/mad.compile
 
 $(STATEDIR)/mad.targetinstall: $(mad_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install $(MAD_DIR)/madplay $(ROOTDIR)/usr/bin
-	$(CROSSSTRIP) $(ROOTDIR)/usr/bin/madplay
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,mad)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(MAD_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(MAD_DIR)/madplay, /usr/bin/madplay)
+
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -129,6 +141,7 @@ $(STATEDIR)/mad.targetinstall: $(mad_targetinstall_deps)
 
 mad_clean:
 	rm -rf $(STATEDIR)/mad.*
+	rm -rf $(IMAGEDIR)/mad_*
 	rm -rf $(MAD_DIR)
 
 # vim: syntax=make
diff --git a/rules/madwifi.make b/rules/madwifi.make
index c2d605e5c..2ab55f5cd 100644
--- a/rules/madwifi.make
+++ b/rules/madwifi.make
@@ -64,6 +64,7 @@ $(STATEDIR)/madwifi.extract: $(madwifi_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(MADWIFI_DIR))
 	@$(call extract, $(MADWIFI_SOURCE))
+	@$(call patchin, $(MADWIFI))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -137,15 +138,28 @@ madwifi_targetinstall_deps = $(STATEDIR)/madwifi.compile
 # requires uudecode, which is part of sharutils
 $(STATEDIR)/madwifi.targetinstall: $(madwifi_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,madwifi)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(MADWIFI_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	# FIXME: ipkgize
 ifdef PTXCONF_KERNEL_INSTALL
 	cd $(MADWIFI_DIR) && $(MADWIFI_ENV) $(MADWIFI_PATH) $(MAKE) install
 endif
 ifdef PTXCONF_MADWIFI_TOOLS_ATHEROS_STATS
-	install -m555  $(MADWIFI_DIR)/tools/athstats $(ROOTDIR)/usr/bin/
+	@$(call install_copy, 0, 0, 0555, $(MADWIFI_DIR)/tools/athstats, /usr/bin/athstats)
 endif
 ifdef PTXCONF_MADWIFI_TOOLS_80211_STATS
-	install -m555  $(MADWIFI_DIR)/tools/80211stats $(ROOTDIR)/usr/bin/
+	@$(call install_copy, 0, 0, 0555, $(MADWIFI_DIR)/tools/80211stats, /usr/bin/80211stats)
 endif
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -154,6 +168,7 @@ endif
 
 madwifi_clean:
 	rm -rf $(STATEDIR)/madwifi.*
+	rm -rf $(IMAGEDIR)/madwifi_*
 	rm -rf $(MADWIFI_DIR)
 
 # vim: syntax=make
diff --git a/rules/memtest.make b/rules/memtest.make
index 681085c58..88373557d 100644
--- a/rules/memtest.make
+++ b/rules/memtest.make
@@ -118,7 +118,20 @@ memtest_targetinstall_deps = $(STATEDIR)/memtest.compile
 
 $(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps)
 	@$(call targetinfo, $@)
-	cp $(MEMTEST_DIR)/mtest $(ROOTDIR)/usr/bin
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,memtest)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(MEMTEST_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(MEMTEST_DIR)/mtest, /usr/sbin/memtest)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -127,6 +140,7 @@ $(STATEDIR)/memtest.targetinstall: $(memtest_targetinstall_deps)
 
 memtest_clean:
 	rm -rf $(STATEDIR)/memtest.*
+	rm -rf $(IMAGEDIR)/memtest_*
 	rm -rf $(MEMTEST_DIR)
 
 # vim: syntax=make
diff --git a/rules/mfirebird.make b/rules/mfirebird.make
index f25e51db1..d24b1e23c 100644
--- a/rules/mfirebird.make
+++ b/rules/mfirebird.make
@@ -467,32 +467,41 @@ mfirebird_targetinstall_deps	+= $(STATEDIR)/glib22.targetinstall
 $(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps)
 	@$(call targetinfo, $@)
 
-	# cd $(MFIREBIRD_DIR) && $(MFIREBIRD_PATH) $(MFIREBIRD_ENV) make install DESTDIR=$(ROOTDIR)
-	install -d $(ROOTDIR)/usr/lib
-
-	install $(MFIREBIRD_DIR)/dist/lib/libgkgfx.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libgtkembedmoz.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libgtkxtbin.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libjsj.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libmozjs.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libmozz.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libnspr4.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libnss3.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libplds4.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libplc4.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libsmime3.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libsoftokn3.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libssl3.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libxpcom.so $(ROOTDIR)/usr/lib
-	install $(MFIREBIRD_DIR)/dist/lib/libxpcom_compat.so $(ROOTDIR)/usr/lib
-
-	install -d $(ROOTDIR)/usr/lib/mozilla-1.6
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,mfirebird)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(MFIREBIRD_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgkgfx.so, /usr/lib/libgkgfx.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkembedmoz.so, /usr/lib/libgtkembedmoz.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libgtkxtbin.so, /usr/lib/libgtkxtbin.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libjsj.so, /usr/lib/libjsj.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozjs.so, /usr/lib/libmozjs.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libmozz.so, /usr/lib/libmozz.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnspr4.so, /usr/lib/libnspr4.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libnss3.so, /usr/lib/libnss3.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplds4.so, /usr/lib/libplds4.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libplc4.so, /usr/lib/libplc4.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsmime3.so, /usr/lib/libsmime3.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libsoftokn3.so, /usr/lib/libsoftokn3.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libssl3.so, /usr/lib/libssl3.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom.so, /usr/lib/libxpcom.so)
+	@$(call install_copy, 0, 0, 0644, $(MFIREBIRD_DIR)/dist/lib/libxpcom_compat.so, /usr/lib/libxpcom_compat.so)
+
 #	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6/components $(ROOTDIR)/usr/lib/mozilla-1.6
 #	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6/chrome $(ROOTDIR)/usr/lib/mozilla-1.6
 #	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6/res $(ROOTDIR)/usr/lib/mozilla-1.6
 
 # BSP: Quick and ... 
-	cp -a $(CROSS_LIB_DIR)/lib/mozilla-1.6 $(ROOTDIR)/usr/lib/
+	for file in $(CROSS_LIB_DIR)/lib/mozilla-1.6/*; do 			\
+		$(call install_copy, 0, 0, 0755, $$file, /usr/lib/)		\
+	done
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -502,6 +511,7 @@ $(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps)
 
 mfirebird_clean:
 	rm -rf $(STATEDIR)/mfirebird.*
+	rm -rf $(IMAGEDIR)/mfirebird_*
 	rm -rf $(MFIREBIRD_DIR)
 
 # vim: syntax=make
diff --git a/rules/nano.make b/rules/nano.make
index e5cb1db6e..9d0767ef5 100644
--- a/rules/nano.make
+++ b/rules/nano.make
@@ -111,6 +111,7 @@ nano_install: $(STATEDIR)/nano.install
 
 $(STATEDIR)/nano.install: $(STATEDIR)/nano.compile
 	@$(call targetinfo, $@)
+	# FIXME: put this into targetinstall? 
 	cd $(NANO_DIR) && $(NANO_ENV) $(NANO_PATH) make install
 	touch $@
 
diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make
index 805944fb4..9bd48e1a7 100644
--- a/rules/nfs-utils.make
+++ b/rules/nfs-utils.make
@@ -18,7 +18,8 @@ endif
 #
 # Paths and names 
 #
-NFSUTILS		= nfs-utils-1.0.6-ptx4
+NFSUTILS_VERSION	= 1.0.6-ptx4
+NFSUTILS		= nfs-utils-$(NFSUTILS_VERSION)
 NFSUTILS_URL		= http://www.pengutronix.de/software/nfs-utils/$(NFSUTILS).tar.gz
 NFSUTILS_SOURCE		= $(SRCDIR)/$(NFSUTILS).tar.gz
 NFSUTILS_DIR		= $(BUILDDIR)/$(NFSUTILS)
@@ -138,77 +139,83 @@ nfsutils_targetinstall: $(STATEDIR)/nfsutils.targetinstall
 $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
 	@$(call targetinfo, $@)
 
-	install -d $(ROOTDIR)/etc/init.d
-	install -d $(ROOTDIR)/usr/lib/
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,nfsutils)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(NFSUTILS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_CLIENTSCRIPT))
-	install $(NFSUTILS_DIR)/etc/nodist/nfs-client $(ROOTDIR)/etc/init.d/
+	@$(call install_copy, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-client, /etc/init.d/nfs-client, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_FUNCTIONSSCRIPT))
-	install $(NFSUTILS_DIR)/etc/nodist/nfs-functions $(ROOTDIR)/etc/init.d/
+	@$(call install_copy, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-functions, /etc/init.d/nfs-functions, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SERVERSCRIPT))
-	install $(NFSUTILS_DIR)/etc/nodist/nfs-server $(ROOTDIR)/etc/init.d/
+	@$(call install_copy, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-server, /etc/init.d/nfs-server, n)
         endif
 
-	mkdir -p $(ROOTDIR)/sbin
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_EXPORTFS))
-	install $(NFSUTILS_DIR)/utils/exportfs/.libs/exportfs $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/exportfs
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/exportfs/.libs/exportfs, /sbin/exportfs)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_LOCKD))
-	install $(NFSUTILS_DIR)/utils/lockd/.libs/lockd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lockd
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/lockd/.libs/lockd, /sbin/lockd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_MOUNTD))
-	install $(NFSUTILS_DIR)/utils/mountd/.libs/mountd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mountd
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/mountd/.libs/mountd, /sbin/mountd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSD))
-	install $(NFSUTILS_DIR)/utils/nfsd/.libs/nfsd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nfsd
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsd/.libs/nfsd, /sbin/nfsd)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSSTAT))
-	install $(NFSUTILS_DIR)/utils/nfsstat/.libs/nfsstat $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nfsstat
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsstat/.libs/nfsstat, /sbin/nfsstat)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSGRAPH))
 	# don't strip, this is a shell script
-	install $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph $(ROOTDIR)/sbin/
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph, /sbin/nhfsgraph, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSNUMS))
-	install $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums $(ROOTDIR)/sbin/
 	# don't strip, this is a shell script
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums, /sbin/nhfsnums, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSRUN))
-	install $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun $(ROOTDIR)/sbin/
 	# don't strip, this is a shell script
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun, /sbin/nhfsrun, n)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSSTONE))
-	install $(NFSUTILS_DIR)/utils/nhfsstone/.libs/nhfsstone $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nhfsstone
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/.libs/nhfsstone, /sbin/nhfsstone)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT))
-	install $(NFSUTILS_DIR)/utils/showmount/.libs/showmount $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/showmount
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/showmount/.libs/showmount, /sbin/showmount)
         endif
         ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_STATD))
-	install $(NFSUTILS_DIR)/utils/statd/.libs/statd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/statd
+	@$(call install_copy, 0, 0, 0755, $(NFSUTILS_DIR)/utils/statd/.libs/statd, /sbin/statd)
         endif
 	# copy nessesary libs
-	install $(NFSUTILS_DIR)/support/export/.libs/libexport.so.0.0.0 $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libexport.so.0.0.0
-	install $(NFSUTILS_DIR)/support/nfs/.libs/libnfs.so.0.0.0 $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libnfs.so.0.0.0
-	install $(NFSUTILS_DIR)/support/misc/.libs/libmisc.so.0.0.0 $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libmisc.so.0.0.0
+	@$(call install_copy, 0, 0, 0644, \
+		$(NFSUTILS_DIR)/support/export/.libs/libexport.so.0.0.0, \
+		/usr/lib/libexport.so.0.0.0)
+	@$(call install_copy, 0, 0, 0644, \
+		$(NFSUTILS_DIR)/support/nfs/.libs/libnfs.so.0.0.0, \
+		/usr/lib/libnfs.so.0.0.0)
+	@$(call install_copy, 0, 0, 0644, \
+		$(NFSUTILS_DIR)/support/misc/.libs/libmisc.so.0.0.0, \
+		/usr/lib/libmisc.so.0.0.0)
 
 	# create stuff necessary for nfs
 	rm -rf $(ROOTDIR)/var/lib/nfs 
-	install -d $(ROOTDIR)/var/lib/nfs
+	$(call install_copy, 0, 0, 0755, /var/lib/nfs)
+
+	# FIXME: ipkgize
 	touch $(ROOTDIR)/var/lib/nfs/etab
 	touch $(ROOTDIR)/var/lib/nfs/rmtab
 	touch $(ROOTDIR)/var/lib/nfs/xtab
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -216,6 +223,8 @@ $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
 # ----------------------------------------------------------------------------
 
 nfsutils_clean: 
-	rm -rf $(STATEDIR)/nfsutils.* $(NFSUTILS_DIR)
+	rm -rf $(STATEDIR)/nfsutils.* 
+	rm -rf $(IMAGEDIR)/nfsutils_* 
+	rm -rf $(NFSUTILS_DIR)
 
 # vim: syntax=make
diff --git a/rules/nmap.make b/rules/nmap.make
index 48a0c38b6..9c69d0033 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -59,6 +59,7 @@ $(STATEDIR)/nmap.extract: $(STATEDIR)/nmap.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(NMAP_DIR))
 	@$(call extract, $(NMAP_SOURCE))
+	@$(call patchin, $(NMAP))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -145,17 +146,26 @@ endif
 
 $(STATEDIR)/nmap.targetinstall: $(nmap_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -D $(NMAP_DIR)/nmap $(ROOTDIR)/usr/bin/nmap
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/nmap
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,nmap)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(NMAP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(NMAP_DIR)/nmap, /usr/bin/nmap)
 
 ifdef PTXCONF_NMAP_SERVICES
-	mkdir -p $(ROOTDIR)/usr/share/nmap
-	install -m 644 $(NMAP_DIR)/nmap-os-fingerprints $(ROOTDIR)/usr/share/nmap/nmap-os-fingerprints
-	install -m 644 $(NMAP_DIR)/nmap-service-probes $(ROOTDIR)/usr/share/nmap/nmap-service-probes
-	install -m 644 $(NMAP_DIR)/nmap-services $(ROOTDIR)/usr/share/nmap/nmap-services
-	install -m 644 $(NMAP_DIR)/nmap-protocols $(ROOTDIR)/usr/share/nmap/nmap-protocols
-	install -m 644 $(NMAP_DIR)/nmap-rpc $(ROOTDIR)/usr/share/nmap/nmap-rpc
+	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-os-fingerprints, /usr/share/nmap/nmap-os-fingerprints, n)
+	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-service-probes, /usr/share/nmap/nmap-service-probes, n)
+	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-services, /usr/share/nmap/nmap-services, n)
+	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-protocols, /usr/share/nmap/nmap-protocols, n)
+	@$(call install_copy, 0, 0, 0644, $(NMAP_DIR)/nmap-rpc, /usr/share/nmap/nmap-rpc, n)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -163,6 +173,8 @@ endif
 # ----------------------------------------------------------------------------
 
 nmap_clean: 
-	rm -rf $(STATEDIR)/nmap.* $(NMAP_DIR)
+	rm -rf $(STATEDIR)/nmap.* 
+	rm -rf $(IMAGEDIR)/nmap_* 
+	rm -rf $(NMAP_DIR)
 
 # vim: syntax=make
diff --git a/rules/ntp.make b/rules/ntp.make
index 13958e6e3..c1e4f1d60 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -21,9 +21,9 @@ endif
 #
 NTP_VERSION	= 4.2.0
 NTP		= ntp-$(NTP_VERSION)
-NTP_SUFFIX		= tar.gz
+NTP_SUFFIX	= tar.gz
 NTP_URL		= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4//$(NTP).$(NTP_SUFFIX)
-NTP_SOURCE		= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
+NTP_SOURCE	= $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
 NTP_DIR		= $(BUILDDIR)/$(NTP)
 
 # ----------------------------------------------------------------------------
@@ -54,6 +54,7 @@ $(STATEDIR)/ntp.extract: $(ntp_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(NTP_DIR))
 	@$(call extract, $(NTP_SOURCE))
+	@$(call patchin, $(NTP))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -362,10 +363,20 @@ ntp_targetinstall_deps = $(STATEDIR)/ntp.compile
 
 $(STATEDIR)/ntp.targetinstall: $(ntp_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,ntp)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(NTP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
 ifdef PTXCONF_NTP_NTPDATE
-	cp $(NTP_DIR)/ntpdate/ntpdate $(ROOTDIR)/usr/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/ntpdate
+	@$(call install_copy, 0, 0, 0755, $(NTP_DIR)/ntpdate/ntpdate, /usr/sbin/ntpdate)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -374,6 +385,7 @@ endif
 
 ntp_clean:
 	rm -rf $(STATEDIR)/ntp.*
+	rm -rf $(IMAGEDIR)/ntp_*
 	rm -rf $(NTP_DIR)
 
 # vim: syntax=make
diff --git a/rules/omniorb.make b/rules/omniorb.make
index 572e9885f..5658491e3 100644
--- a/rules/omniorb.make
+++ b/rules/omniorb.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: ipkgize
+
 #
 # We provide this package
 #
diff --git a/rules/openafs.make b/rules/openafs.make
index f81f09fc8..92add9401 100644
--- a/rules/openafs.make
+++ b/rules/openafs.make
@@ -54,6 +54,7 @@ $(STATEDIR)/openafs.extract: $(openafs_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(OPENAFS_DIR))
 	@$(call extract, $(OPENAFS_SOURCE))
+	@$(call patchin, $(OPENAFS))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -128,8 +129,20 @@ openafs_targetinstall_deps = $(STATEDIR)/openafs.compile
 
 $(STATEDIR)/openafs.targetinstall: $(openafs_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr
-	cp -a $(OPENAFS_DIR)/$(OPENAFS_SYS)/dest/root.client/usr/vice $(ROOTDIR)/usr
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,openafs)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(OPENAFS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0744, $(OPENAFS_DIR)/$(OPENAFS_SYS)/dest/root.client/usr/vice, /usr/bin/vice)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -138,6 +151,7 @@ $(STATEDIR)/openafs.targetinstall: $(openafs_targetinstall_deps)
 
 openafs_clean:
 	rm -rf $(STATEDIR)/openafs.*
+	rm -rf $(IMAGEDIR)/openafs_*
 	rm -rf $(OPENAFS_DIR)
 
 # vim: syntax=make
diff --git a/rules/openssh.make b/rules/openssh.make
index 1c68d2f71..ebb3cf112 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -26,7 +26,8 @@ endif
 #
 # Paths and names 
 #
-OPENSSH			= openssh-3.9p1
+OPENSSH_VERSION		= 3.9p1
+OPENSSH			= openssh-$(OPENSSH_VERSION)
 OPENSSH_URL 		= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$(OPENSSH).tar.gz
 OPENSSH_SOURCE		= $(SRCDIR)/$(OPENSSH).tar.gz
 OPENSSH_DIR 		= $(BUILDDIR)/$(OPENSSH)
@@ -162,7 +163,7 @@ openssh_compile: $(STATEDIR)/openssh.compile
 
 $(STATEDIR)/openssh.compile: $(STATEDIR)/openssh.prepare 
 	@$(call targetinfo, $@)
-	$(OPENSSH_PATH) make -C $(OPENSSH_DIR)
+	cd $(OPENSSH_DIR) && $(OPENSSH_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -189,38 +190,45 @@ openssh_targetinstall_deps = \
 $(STATEDIR)/openssh.targetinstall: $(openssh_targetinstall_deps)
 	@$(call targetinfo, $@)
 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,openssh)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(OPENSSH_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
 ifdef PTXCONF_OPENSSH_SSH
-	install -m 644 -D $(OPENSSH_DIR)/ssh_config.out $(ROOTDIR)/etc/ssh/ssh_config
-	install -m 755 -D $(OPENSSH_DIR)/ssh $(ROOTDIR)/usr/bin/ssh
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/ssh
+	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/ssh_config.out, /etc/ssh/ssh_config, n)
+	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/ssh, /usr/bin/ssh)
 endif
 
 ifdef PTXCONF_OPENSSH_SSHD
-	install -m 644 -D $(OPENSSH_DIR)/moduli.out $(ROOTDIR)/etc/ssh/moduli
-	install -m 644 -D $(OPENSSH_DIR)/sshd_config.out $(ROOTDIR)/etc/ssh/sshd_config
+	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/moduli.out, /etc/ssh/moduli, n)
+	@$(call install_copy, 0, 0, 0644, $(OPENSSH_DIR)/sshd_config.out, /etc/ssh/sshd_config, n)
 	perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin yes/" \
-	$(ROOTDIR)/etc/ssh/sshd_config
-	install -m 755 -D $(OPENSSH_DIR)/sshd $(ROOTDIR)/usr/sbin/sshd
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/sshd
+		$(ROOTDIR)/etc/ssh/sshd_config
+	perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin yes/" \
+		$(IMAGEDIR)/ipkg/etc/ssh/sshd_config
+	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/sshd, /usr/sbin/sshd)
 endif
 
 ifdef PTXCONF_OPENSSH_SCP
-	install -m 755 -D $(OPENSSH_DIR)/scp $(ROOTDIR)/usr/bin/scp
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/scp
+	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/scp, /usr/bin/scp)
 endif
 
 ifdef PTXCONF_OPENSSH_SFTP_SERVER
-	install -m 755 -D $(OPENSSH_DIR)/sftp-server $(ROOTDIR)/usr/sbin/sftp-server
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/sftp-server
+	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/sftp-server, /usr/sbin/sftp-server)
 endif
 
 ifdef PTXCONF_OPENSSH_KEYGEN
 	# FIXME: if this is the only file in this directory move it
 	# to somewhere else (patch, echo << EOF?) [RSC]
-	install -m 755 -D $(MISCDIR)/openssh-host-keygen.sh $(ROOTDIR)/sbin/openssh-host-keygen.sh
-	install -m 755 -D $(OPENSSH_DIR)/ssh-keygen $(ROOTDIR)/usr/bin/ssh-keygen
-	$(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/ssh-keygen
+	@$(call install_copy, 0, 0, 0755, $(MISCDIR)/openssh-host-keygen.sh, /sbin/openssh-host-keygen.sh, n)
+	@$(call install_copy, 0, 0, 0755, $(OPENSSH_DIR)/ssh-keygen, /usr/bin/ssh-keygen)
 endif
+	@$(call install_finish)
 
 	touch $@
 
@@ -229,6 +237,8 @@ endif
 # ----------------------------------------------------------------------------
 
 openssh_clean: 
-	rm -rf $(STATEDIR)/openssh* $(OPENSSH_DIR)
+	rm -rf $(STATEDIR)/openssh.* 
+	rm -rf $(IMAGEDIR)/openssh_* 
+	rm -rf $(OPENSSH_DIR)
 
 # vim: syntax=make
diff --git a/rules/openssl.make b/rules/openssl.make
index 6733b58a2..b04a073f7 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -20,7 +20,8 @@ endif
 #
 # Paths and names 
 #
-OPENSSL			= openssl-0.9.7d
+OPENSSL_VERSION		= 0.9.7d
+OPENSSL			= openssl-$(OPENSSL_VERSION)
 OPENSSL_URL 		= http://www.openssl.org/source/$(OPENSSL).tar.gz
 OPENSSL_SOURCE		= $(SRCDIR)/$(OPENSSL).tar.gz
 OPENSSL_DIR 		= $(BUILDDIR)/$(OPENSSL)
@@ -126,8 +127,8 @@ $(STATEDIR)/openssl.compile: $(STATEDIR)/openssl.prepare
 #
 # generate openssl.pc with correct path inside
 #
-	$(OPENSSL_PATH) make -C $(OPENSSL_DIR) INSTALLTOP=$(CROSS_LIB_DIR) openssl.pc
-	$(OPENSSL_PATH) make -C $(OPENSSL_DIR) $(OPENSSL_MAKEVARS)
+	cd $(OPENSSL_DIR) && $(OPENSSL_PATH) make INSTALLTOP=$(CROSS_LIB_DIR) openssl.pc
+	cd $(OPENSSL_DIR) && $(OPENSSL_PATH) make $(OPENSSL_MAKEVARS)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -164,15 +165,29 @@ openssl_targetinstall_deps = \
 
 $(STATEDIR)/openssl.targetinstall: $(openssl_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,openssl)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(OPENSSL_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
 ifdef PTXCONF_OPENSSL_SHARED
 	mkdir -p $(ROOTDIR)/usr/lib
 
-	cp -d $(OPENSSL_DIR)/libssl.so* $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libssl.so*
+	# FIXME: wildcard copy
+	@$(call install_copy, 0, 0, 0644, \
+		$(OPENSSL_DIR)/libssl.so*, \
+		/usr/lib/)
 
-	cp -d $(OPENSSL_DIR)/libcrypto.so* $(ROOTDIR)/usr/lib/
-	$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/usr/lib/libcrypto.so*
+	@$(call install_copy, 0, 0, 0644, \
+		$(OPENSSL_DIR)/libcrypto.so*, \
+		/usr/lib/)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -180,6 +195,8 @@ endif
 # ----------------------------------------------------------------------------
 
 openssl_clean: 
-	rm -rf $(STATEDIR)/openssl.* $(OPENSSL_DIR)
+	rm -rf $(STATEDIR)/openssl.* 
+	rm -rf $(IMAGEDIR)/openssl_* 
+	rm -rf $(OPENSSL_DIR)
 
 # vim: syntax=make
diff --git a/rules/oprofile.make b/rules/oprofile.make
index fdd2b0ccb..5277b2f3e 100644
--- a/rules/oprofile.make
+++ b/rules/oprofile.make
@@ -54,6 +54,7 @@ $(STATEDIR)/oprofile.extract: $(oprofile_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(OPROFILE_DIR))
 	@$(call extract, $(OPROFILE_SOURCE))
+	@$(call patchin, $(OPROFILE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -129,6 +130,7 @@ oprofile_targetinstall_deps	=  $(STATEDIR)/oprofile.compile
 
 $(STATEDIR)/oprofile.targetinstall: $(oprofile_targetinstall_deps)
 	@$(call targetinfo, $@)
+	# FIXME: nothing to do on targetinstall? 
 	touch $@
 
 # ----------------------------------------------------------------------------
diff --git a/rules/pango12.make b/rules/pango12.make
index ef19c7a9b..790d37249 100644
--- a/rules/pango12.make
+++ b/rules/pango12.make
@@ -61,6 +61,7 @@ $(STATEDIR)/pango12.extract: $(pango12_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(PANGO12_DIR))
 	@$(call extract, $(PANGO12_SOURCE))
+	@$(call patchin, $(PANGO12))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -139,31 +140,60 @@ pango12_targetinstall_deps	+= $(STATEDIR)/freetype.targetinstall
 
 $(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/lib
-	rm -f $(ROOTDIR)/lib/libpango-1.0.so*
-
-	install $(PANGO12_DIR)/pango/.libs/libpango-1.0.so.0.300.2 $(ROOTDIR)/lib/
-	ln -sf libpango-1.0.so.0.300.2 $(ROOTDIR)/lib/libpango-1.0.so.0
-	ln -sf libpango-1.0.so.0.300.2 $(ROOTDIR)/lib/libpango-1.0.so
 
-	install $(PANGO12_DIR)/pango/.libs/libpangox-1.0.so.0.300.2 $(ROOTDIR)/lib/
-	ln -sf libpangox-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangox-1.0.so.0
-	ln -sf  libpangox-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangox-1.0.so
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,pango12)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PANGO12_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
 
-	install $(PANGO12_DIR)/pango/.libs/libpangoxft-1.0.so.0.300.2 $(ROOTDIR)/lib/
-	ln -sf libpangoxft-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangoxft-1.0.so.0
-	ln -sf  libpangoxft-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangoxft-1.0.so
+	rm -f $(ROOTDIR)/lib/libpango-1.0.so*
 
-	install $(PANGO12_DIR)/pango/.libs/libpangoft2-1.0.so.0.300.2 $(ROOTDIR)/lib/
-	ln -sf libpangoft2-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangoft2-1.0.so.0
-	ln -sf  libpangoft2-1.0.so.0.300.2 $(ROOTDIR)/lib/libpangoft2-1.0.so
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/pango/.libs/libpango-1.0.so.0.300.2, \
+		/usr/lib/libpango-1.0.so.0.300.2)
+	@$(call install_link, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so.0)
+	@$(call install_link, libpango-1.0.so.0.300.2, /usr/lib/libpango-1.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/pango/.libs/libpangox-1.0.so.0.300.2, \
+		/usr/lib/libpangox-1.0.so.0.300.2)
+	@$(call install_link, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so.0)
+	@$(call install_link, libpangox-1.0.so.0.300.2, /lib/libpangox-1.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/pango/.libs/libpangoxft-1.0.so.0.300.2, \
+		/usr/lib/libpangoxft-1.0.so.0.300.2)
+	@$(call install_link, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so.0)
+	@$(call install_link, libpangoxft-1.0.so.0.300.2, /usr/lib/libpangoxft-1.0.so)
+
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/pango/.libs/libpangoft2-1.0.so.0.300.2, \
+		/usr/lib/libpangoft2-1.0.so.0.300.2)
+	@$(call install_link, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so.0)
+	@$(call install_link, libpangoft2-1.0.so.0.300.2, /lib/libpangoft2-1.0.so)
 	
-	install $(PANGO12_DIR)/pango/.libs/pango-querymodules $(ROOTDIR)/usr/bin
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/pango/.libs/pango-querymodules, \
+		/usr/bin/pango-querymodules)
+		
+	# FIXME: ipkgize
 	cp -a $(CROSS_LIB_DIR)/lib/pango $(ROOTDIR)/usr/lib
+
+	# FIXME: broken path; compare with ptxdist before 0.7.4
+	@$(call install_copy, 0, 0, 0644, \
+		$(ROOTDIR)/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules, 
+		/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules)
+	@$(call install_copy, 0, 0, 0644, \
+		$(PANGO12_DIR)/modules/basic/.libs/*.so, \
+		/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules)
+	@$(call install_finish)
+	
 	touch $@
 	
-	install -d $(ROOTDIR)/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules
-	cp $(PANGO12_DIR)/modules/basic/.libs/*.so $(ROOTDIR)/usr/lib/pango/$(PANGO_MODULE_VERSION)/modules
 
 # ----------------------------------------------------------------------------
 # Clean
@@ -171,6 +201,7 @@ $(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps)
 
 pango12_clean:
 	rm -rf $(STATEDIR)/pango12.*
+	rm -rf $(IMAGEDIR)/pango12_*
 	rm -rf $(PANGO12_DIR)
 	rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/pango*
 
diff --git a/rules/paranoia.make b/rules/paranoia.make
index b7c686ffc..c61ee3cee 100644
--- a/rules/paranoia.make
+++ b/rules/paranoia.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: does nothing on targetinstall? 
+
 #
 # We provide this package
 #
diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make
index f2f9cca7f..f8da39bd4 100644
--- a/rules/pcmcia-cs.make
+++ b/rules/pcmcia-cs.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: does nothing on targetinstall
+
 #
 # We provide this package
 #
@@ -54,6 +56,7 @@ $(STATEDIR)/pcmcia-cs.extract: $(pcmcia-cs_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(PCMCIA-CS_DIR))
 	@$(call extract, $(PCMCIA-CS_SOURCE))
+	@$(call patchin, $(PCMCIA-CS))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -122,6 +125,7 @@ $(STATEDIR)/pcmcia-cs.targetinstall: $(pcmcia-cs_targetinstall_deps)
 
 pcmcia-cs_clean:
 	rm -rf $(STATEDIR)/pcmcia-cs.*
+	rm -rf $(IMAGEDIR)/pcmcia-cs_*
 	rm -rf $(PCMCIA-CS_DIR)
 
 # vim: syntax=make
diff --git a/rules/pdksh.make b/rules/pdksh.make
index b4f0834b6..937e6d5e7 100644
--- a/rules/pdksh.make
+++ b/rules/pdksh.make
@@ -20,7 +20,8 @@ endif
 #
 # Paths and names 
 #
-PDKSH			= pdksh-5.2.14
+PDKSK_VERSION		= 5.2.14
+PDKSH			= pdksh-$(PDKSK_VERSION)
 PDKSH_URL		= ftp://ftp.cs.mun.ca/pub/pdksh/$(PDKSH).tar.gz 
 PDKSH_SOURCE		= $(SRCDIR)/$(PDKSH).tar.gz
 PDKSH_DIR		= $(BUILDDIR)/$(PDKSH)
@@ -49,6 +50,7 @@ $(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(PDKSH_DIR))
 	@$(call extract, $(PDKSH_SOURCE))
+	@$(call patchin, $(PDKSH))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -144,7 +146,7 @@ pdksh_compile: $(STATEDIR)/pdksh.compile
 
 $(STATEDIR)/pdksh.compile: $(STATEDIR)/pdksh.prepare 
 	@$(call targetinfo, $@)
-	$(PDKSH_PATH) make -C $(PDKSH_DIR)
+	cd $(PDKSH_DIR) && $(PDKSH_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -165,9 +167,19 @@ pdksh_targetinstall: $(STATEDIR)/pdksh.targetinstall
 
 $(STATEDIR)/pdksh.targetinstall: $(STATEDIR)/pdksh.install
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/bin
-	install $(PDKSH_DIR)/ksh $(ROOTDIR)/bin
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/ksh
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,pdksh)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PDKSH_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(PDKSH_DIR)/ksh, /bin/ksh)
+	
+	@$(call install_finish
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -175,6 +187,8 @@ $(STATEDIR)/pdksh.targetinstall: $(STATEDIR)/pdksh.install
 # ----------------------------------------------------------------------------
 
 pdksh_clean: 
-	rm -rf $(STATEDIR)/pdksh.* $(PDKSH_DIR)
+	rm -rf $(STATEDIR)/pdksh.* 
+	rm -rf $(IMAGEDIR)/pdksh_* 
+	rm -rf $(PDKSH_DIR)
 
 # vim: syntax=make
diff --git a/rules/penguzilla.make b/rules/penguzilla.make
index 40ef9c6eb..a39290363 100644
--- a/rules/penguzilla.make
+++ b/rules/penguzilla.make
@@ -54,6 +54,7 @@ $(STATEDIR)/penguzilla.extract: $(penguzilla_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(PENGUZILLA_DIR))
 	@$(call extract, $(PENGUZILLA_SOURCE))
+	@$(call patchin, $(PENGUZILLA))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -132,15 +133,26 @@ penguzilla_targetinstall_deps =	\
 $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps)
 	@$(call targetinfo, $@)
 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,penguzilla)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PENGUZILLA_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
 # 	# pixmap directory
-	install -d $(ROOTDIR)/usr/share/penguzilla/pixmaps
-	cp -a $(PENGUZILLA_DIR)/pixmaps/* $(ROOTDIR)/usr/share/penguzilla/pixmaps
+	for file in $(PENGUZILLA_DIR)/pixmaps/*; do 						\
+		$(call install_copy, 0, 0, 0644, $$file, /usr/share/penguzilla/pixmaps/)	\
+	done
 
-	install -d $(ROOTDIR)/usr/bin
-	install $(PENGUZILLA_DIR)/src/penguzilla $(ROOTDIR)/usr/bin
+	@$(call install_copy, 0, 0, 0755, $(PENGUZILLA_DIR)/src/penguzilla, /usr/bin/penguzilla)
 
 # 	# Style
-	install $(PENGUZILLA_DIR)/penguzilla.rc $(ROOTDIR)/usr/share/penguzilla
+	@$(call install_copy, 0, 0, 0644, $(PENGUZILLA_DIR)/penguzilla.rc, /usr/share/penguzilla/penguzillarc, n)
+
+	@$(call install_finish)
 
 	touch $@
 
@@ -150,6 +162,7 @@ $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps)
 
 penguzilla_clean:
 	rm -rf $(STATEDIR)/penguzilla.*
+	rm -rf $(IMAGEDIR)/penguzilla_*
 	rm -rf $(PENGUZILLA_DIR)
 
 # vim: syntax=make
diff --git a/rules/popt.make b/rules/popt.make
index 029d3293a..c29c807a4 100644
--- a/rules/popt.make
+++ b/rules/popt.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: does nothing on targetinstall? 
+
 #
 # We provide this package
 #
@@ -54,6 +56,7 @@ $(STATEDIR)/popt.extract: $(popt_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(POPT_DIR))
 	@$(call extract, $(POPT_SOURCE))
+	@$(call patchin, $(POPT))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -98,7 +101,7 @@ popt_compile_deps = $(STATEDIR)/popt.prepare
 
 $(STATEDIR)/popt.compile: $(popt_compile_deps)
 	@$(call targetinfo, $@)
-	$(POPT_PATH) make -C $(POPT_DIR)
+	cd $(POPT_DIR) && $(POPT_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -109,7 +112,7 @@ popt_install: $(STATEDIR)/popt.install
 
 $(STATEDIR)/popt.install: $(STATEDIR)/popt.compile
 	@$(call targetinfo, $@)
-	$(POPT_PATH) make -C $(POPT_DIR) install
+	cd $(POPT_DIR) && $(POPT_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -130,6 +133,7 @@ $(STATEDIR)/popt.targetinstall: $(popt_targetinstall_deps)
 
 popt_clean:
 	rm -rf $(STATEDIR)/popt.*
+	rm -rf $(IMAGEDIR)/popt_*
 	rm -rf $(POPT_DIR)
 
 # vim: syntax=make
diff --git a/rules/portmap.make b/rules/portmap.make
index be1ec27db..33e3f90ae 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -84,8 +84,8 @@ PORTMAP_MAKEVARS	= WRAP_DIR=$(CROSS_LIB_DIR)/lib
 
 $(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare
 	@$(call targetinfo, $@)
-	$(PORTMAP_ENV) $(PORTMAP_PATH) \
-		make -C $(PORTMAP_DIR) $(PORTMAP_MAKEVARS)
+	cd $(PORTMAP_DIR) && 						\
+		$(PORTMAP_ENV) $(PORTMAP_PATH) make $(PORTMAP_MAKEVARS)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -106,11 +106,21 @@ portmap_targetinstall: $(STATEDIR)/portmap.targetinstall
 
 $(STATEDIR)/portmap.targetinstall: $(STATEDIR)/portmap.install
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,portmap)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PORTMAP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
 ifdef PTXCONF_PORTMAP_INSTALL_PORTMAPPER
-	mkdir -p $(ROOTDIR)/sbin
-	install $(PORTMAP_DIR)/portmap $(ROOTDIR)/sbin
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/portmap
+
+	@$(call install_copy, 0, 0, 0755, $(PORTMAP_DIR)/portmap, /sbin/portmap)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -118,6 +128,8 @@ endif
 # ----------------------------------------------------------------------------
 
 portmap_clean: 
-	rm -rf $(STATEDIR)/portmap.* $(PORTMAP_DIR)
+	rm -rf $(STATEDIR)/portmap.* 
+	rm -rf $(IMAGEDIR)/portmap_* 
+	rm -rf $(PORTMAP_DIR)
 
 # vim: syntax=make
diff --git a/rules/pppd.make b/rules/pppd.make
index d3dba9ac1..68ee3c4ac 100644
--- a/rules/pppd.make
+++ b/rules/pppd.make
@@ -19,7 +19,8 @@ endif
 #
 # Paths and names 
 #
-PPP		= ppp-2.4.1
+PPP_VERSION	= 2.4.1
+PPP		= ppp-$(PPP_VERSION)
 PPP_URL		= ftp://ftp.samba.org/pub/ppp/$(PPP).tar.gz
 PPP_SOURCE	= $(SRCDIR)/$(PPP).tar.gz
 PPP_DIR		= $(BUILDDIR)/$(PPP)
@@ -133,13 +134,20 @@ ppp_targetinstall: $(STATEDIR)/ppp.targetinstall
 
 $(STATEDIR)/ppp.targetinstall: $(STATEDIR)/ppp.compile
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr/sbin
-	install $(PPP_DIR)/pppd/pppd $(ROOTDIR)/usr/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/pppd
-
-	install $(PPP_DIR)/chat/chat $(ROOTDIR)/usr/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/chat
 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,ppp)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PPP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(PPP_DIR)/pppd/pppd, /usr/sbin/pppd)
+	@$(call install_copy, 0, 0, 0755, $(PPP_DIR)/chat/chat, /usr/sbin/chat)
+
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -147,7 +155,8 @@ $(STATEDIR)/ppp.targetinstall: $(STATEDIR)/ppp.compile
 # ----------------------------------------------------------------------------
 
 ppp_clean: 
-	-rm -rf $(STATEDIR)/ppp* 
+	-rm -rf $(STATEDIR)/ppp.* 
+	-rm -rf $(IMAGEDIR)/ppp_* 
 	-rm -rf $(PPP_DIR) 
 
-# vim: syntax=make
\ No newline at end of file
+# vim: syntax=make
diff --git a/rules/procps.make b/rules/procps.make
index 48949b9b0..0d55be1dc 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -141,37 +141,40 @@ procps_targetinstall_deps = \
 
 $(STATEDIR)/procps.targetinstall: $(procps_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/bin
-	install -d $(ROOTDIR)/sbin
 
-	install -d $(ROOTDIR)/lib
-	cp -d $(PROCPS_DIR)/proc/libproc*so* $(ROOTDIR)/lib
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,procps)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PROCPS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	for file in $(PROCPS_DIR)/proc/libproc*so*; do			\
+		$(call install_copy, 0, 0, 0644, $$file, /lib/)		\
+	done
 
 ifdef PTXCONF_PROCPS_TOP
-	install -D $(PROCPS_DIR)/top  $(ROOTDIR)/usr/bin/top
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/top
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/top, /usr/bin/top)
 endif
 
 ifdef PTXCONF_PROCPS_SLABTOP
-	install -D $(PROCPS_DIR)/slabtop  $(ROOTDIR)/usr/bin/slabtop
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/slabtop
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/slabtop, /usr/bin/slabtop)
 endif
 ifdef PTXCONF_PROCPS_SYSCTL
-	install -D $(PROCPS_DIR)/sysctl  $(ROOTDIR)/sbin/sysctl
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/sysctl
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/sysctl, /sbin/sysctl)
 endif
 ifdef PTXCONF_PROCPS_PS
-	install -D $(PROCPS_DIR)/ps/ps  $(ROOTDIR)/sbin/ps
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/ps
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/ps/ps, /sbin/ps)
 endif
 ifdef PTXCONF_PROCPS_W
-	install -D $(PROCPS_DIR)/w  $(ROOTDIR)/sbin/w
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/w
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/w, /sbin/w)
 endif
 ifdef PTXCONF_PROCPS_PGREP
-	install -D $(PROCPS_DIR)/pgrep  $(ROOTDIR)/sbin/pgrep
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/pgrep
+	@$(call install_copy, 0, 0, 0755, $(PROCPS_DIR)/pgrep, $(ROOTDIR)/sbin/pgrep)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -180,6 +183,7 @@ endif
 
 procps_clean:
 	rm -rf $(STATEDIR)/procps.*
+	rm -rf $(IMAGEDIR)/procps_*
 	rm -rf $(PROCPS_DIR)
 
 # vim: syntax=make
diff --git a/rules/python.make b/rules/python.make
index e23f206a4..224bad833 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -129,8 +129,21 @@ python_targetinstall: $(STATEDIR)/python.targetinstall
 $(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile
 	@$(call targetinfo, $@)
 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,python)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(PYTHON_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: RSC: ipkgize in a cleaner way
+
 	$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) \
 		altbininstall DESTDIR=$(ROOTDIR)
+	$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) \
+		altbininstall DESTDIR=$(IMAGEDIR)/ipkg
 
 #	umask 022 && \
 #		$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) \
@@ -146,7 +159,9 @@ $(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile
 #		oldsharedinstall DESTDIR=$(ROOTDIR)
 
 	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/python2.3
+	$(CROSSSTRIP) -R .note -R .comment $(IMAGEDIR)/ipkg/usr/bin/python2.3
 
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -155,6 +170,7 @@ $(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile
 
 python_clean: 
 	rm -rf $(STATEDIR)/python.*
+	rm -rf $(IMAGEDIR)/python_*
 	rm -fr $(PYTHON_DIR)
 	rm -fr $(PYTHON_BUILDDIR)
 
diff --git a/rules/qt.make b/rules/qt.make
index 416c137e2..016b20ea4 100644
--- a/rules/qt.make
+++ b/rules/qt.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: do something on targetinstall
+
 #
 # We provide this package
 #
@@ -54,6 +56,7 @@ $(STATEDIR)/qt.extract: $(qt_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(QT_DIR))
 	@$(call extract, $(QT_SOURCE))
+	@$(call patchin, $(QT_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -146,6 +149,7 @@ $(STATEDIR)/qt.targetinstall: $(qt_targetinstall_deps)
 
 qt_clean:
 	rm -rf $(STATEDIR)/qt.*
+	rm -rf $(IMAGEDIR)/qt.*
 	rm -rf $(QT_DIR)
 
 # vim: syntax=make
diff --git a/rules/qte.make b/rules/qte.make
index 8c5851d0e..b109a5bd2 100644
--- a/rules/qte.make
+++ b/rules/qte.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/qte.extract: $(qte_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(QTE_DIR))
 	@$(call extract, $(QTE_SOURCE))
+	@$(call patchin, $(QTE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -153,6 +156,7 @@ $(STATEDIR)/qte.targetinstall: $(qte_targetinstall_deps)
 
 qte_clean:
 	rm -rf $(STATEDIR)/qte.*
+	rm -rf $(IMAGEDIR)/qte_*
 	rm -rf $(QTE_DIR)
 
 # vim: syntax=make
diff --git a/rules/realvnc.make b/rules/realvnc.make
index 1977b822b..195923fb1 100644
--- a/rules/realvnc.make
+++ b/rules/realvnc.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
@@ -139,6 +141,7 @@ $(STATEDIR)/realvnc.targetinstall: $(realvnc_targetinstall_deps)
 
 realvnc_clean:
 	rm -rf $(STATEDIR)/realvnc.*
+	rm -rf $(IMAGeDIR)/realvnc_*
 	rm -rf $(REALVNC_DIR)
 
 # vim: syntax=make
diff --git a/rules/rn.make b/rules/rn.make
index 0e73291c8..b5b93bb8b 100644
--- a/rules/rn.make
+++ b/rules/rn.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: do something on targetinstall
+
 #
 # We provide this package
 #
@@ -54,6 +56,7 @@ $(STATEDIR)/rn.extract: $(rn_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(RN_DIR))
 	@$(call extract, $(RN_SOURCE))
+	@$(call patchin, $(RN))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -104,7 +107,7 @@ rn_compile_deps = $(STATEDIR)/rn.prepare
 
 $(STATEDIR)/rn.compile: $(rn_compile_deps)
 	@$(call targetinfo, $@)
-	$(RN_PATH) make -C $(RN_DIR) $(RN_MAKEVARS)
+	cd $(RN_DIR) && $(RN_PATH) make $(RN_MAKEVARS)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -115,7 +118,7 @@ rn_install: $(STATEDIR)/rn.install
 
 $(STATEDIR)/rn.install: $(STATEDIR)/rn.compile
 	@$(call targetinfo, $@)
-	$(RN_PATH) make -C $(RN_DIR)  $(RN_MAKEVARS) install
+	cd $(RN_DIR) && $(RN_PATH) make $(RN_MAKEVARS) install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -136,6 +139,7 @@ $(STATEDIR)/rn.targetinstall: $(rn_targetinstall_deps)
 
 rn_clean:
 	rm -rf $(STATEDIR)/rn.*
+	rm -rf $(IMAGEDIR)/rn_*
 	rm -rf $(RN_DIR)
 
 # vim: syntax=make
diff --git a/rules/rsync.make b/rules/rsync.make
index de7e1836c..dd6b5d869 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -54,6 +54,7 @@ $(STATEDIR)/rsync.extract: $(rsync_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(RSYNC_DIR))
 	@$(call extract, $(RSYNC_SOURCE))
+	@$(call patchin, $(RSYNC))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -122,9 +123,19 @@ rsync_targetinstall_deps	=  $(STATEDIR)/rsync.compile
 
 $(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/usr/bin
-	install $(RSYNC_DIR)/rsync $(ROOTDIR)/usr/bin/rsync
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/rsync
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,rsync)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(RSYNC_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(RSYNC_DIR)/rsync, /usr/bin/rsync)
+	
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -133,6 +144,7 @@ $(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps)
 
 rsync_clean:
 	rm -rf $(STATEDIR)/rsync.*
+	rm -rf $(IMAGEDIR)/rsync_*
 	rm -rf $(RSYNC_DIR)
 
 # vim: syntax=make
diff --git a/rules/rtai.make b/rules/rtai.make
index 089692f29..8f657134e 100644
--- a/rules/rtai.make
+++ b/rules/rtai.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: this needs maintainance. Really. Not only ipkgisation. 
+
 #
 # We provide this package
 #
diff --git a/rules/rtnet.make b/rules/rtnet.make
index d9f4f1be7..7b03ff682 100644
--- a/rules/rtnet.make
+++ b/rules/rtnet.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: ipkgize
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/rtnet.extract: $(rtnet_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(RTNET_DIR))
 	@$(call extract, $(RTNET_SOURCE))
+	@$(call patchin, $(RTNET))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -303,6 +306,7 @@ endif
 
 rtnet_clean:
 	rm -rf $(STATEDIR)/rtnet.*
+	rm -rf $(IMAGEDIR)/rtnet_*
 	rm -rf $(RTNET_DIR)
 
 # vim: syntax=make
diff --git a/rules/setmixer.make b/rules/setmixer.make
index 9d17a9f10..72021e06b 100644
--- a/rules/setmixer.make
+++ b/rules/setmixer.make
@@ -19,7 +19,8 @@ endif
 #
 # Paths and names
 #
-SETMIXER		= setmixer_27DEC94.orig
+SETMIXER_VERSION	= 27DEC94
+SETMIXER		= setmixer_$(SETMIXER_VERSION).orig
 SETMIXER_SUFFIX		= tar.gz
 SETMIXER_URL		= $(PTXCONF_SETUP_DEBMIRROR)/pool/main/s/setmixer/$(SETMIXER).$(SETMIXER_SUFFIX)
 SETMIXER_SOURCE		= $(SRCDIR)/$(SETMIXER).$(SETMIXER_SUFFIX)
@@ -53,6 +54,7 @@ $(STATEDIR)/setmixer.extract: $(setmixer_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SETMIXER_DIR))
 	@$(call extract, $(SETMIXER_SOURCE))
+	@$(call patchin, $(SETMIXER))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,8 +112,20 @@ setmixer_targetinstall_deps = $(STATEDIR)/setmixer.compile
 
 $(STATEDIR)/setmixer.targetinstall: $(setmixer_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install $(SETMIXER_DIR)/setmixer $(ROOTDIR)/usr/bin
-	$(CROSSSTRIP) $(ROOTDIR)/usr/bin/setmixer
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,setmixer)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(SETMIXER_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, $(SETMIXER_DIR)/setmixer, /usr/bin/setmixer)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -120,6 +134,7 @@ $(STATEDIR)/setmixer.targetinstall: $(setmixer_targetinstall_deps)
 
 setmixer_clean:
 	rm -rf $(STATEDIR)/setmixer.*
+	rm -rf $(IMAGEDIR)/setmixer_*
 	rm -rf $(SETMIXER_DIR)
 
 # vim: syntax=make
diff --git a/rules/shorewall.make b/rules/shorewall.make
index 10c97d160..68d5eb029 100644
--- a/rules/shorewall.make
+++ b/rules/shorewall.make
@@ -55,6 +55,7 @@ $(STATEDIR)/shorewall.extract: $(shorewall_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SHOREWALL_DIR))
 	@$(call extract, $(SHOREWALL_SOURCE))
+	@$(call patchin, $(SHOREWALL))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -91,8 +92,23 @@ shorewall_targetinstall_deps	=  $(STATEDIR)/shorewall.extract
 #
 $(STATEDIR)/shorewall.targetinstall: $(shorewall_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/etc/shorewall
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,shorewall)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(SHOREWALL_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, /etc/shorewall)
+	# FIXME: do this right
 	PREFIX=$(ROOTDIR) $(FAKEROOT) $(SHOREWALL_DIR)/install.sh
+	PREFIX=$(IMAGEDIR)/ipkg $(FAKEROOT) $(SHOREWALL_DIR)/install.sh
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -101,6 +117,7 @@ $(STATEDIR)/shorewall.targetinstall: $(shorewall_targetinstall_deps)
 
 shorewall_clean:
 	rm -rf $(STATEDIR)/shorewall.*
+	rm -rf $(IMAGEDIR)/shorewall_*
 	rm -rf $(SHOREWALL_DIR)
 
 # vim: syntax=make
diff --git a/rules/slang.make b/rules/slang.make
index 37890a950..8548a6504 100644
--- a/rules/slang.make
+++ b/rules/slang.make
@@ -54,6 +54,7 @@ $(STATEDIR)/slang.extract: $(slang_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SLANG_DIR))
 	@$(call extract, $(SLANG_SOURCE))
+	@$(call patchin, $(SLANG))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -97,7 +98,7 @@ slang_compile_deps = $(STATEDIR)/slang.prepare
 
 $(STATEDIR)/slang.compile: $(slang_compile_deps)
 	@$(call targetinfo, $@)
-	$(SLANG_PATH) make -C $(SLANG_DIR) elf
+	cd $(SLANG_DIR) && $(SLANG_PATH) make elf
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -108,7 +109,7 @@ slang_install: $(STATEDIR)/slang.install
 
 $(STATEDIR)/slang.install: $(STATEDIR)/slang.compile
 	@$(call targetinfo, $@)
-	$(SLANG_PATH) make -C $(SLANG_DIR) install-elf
+	cd $(SLANG_DIR) && $(SLANG_PATH) make install-elf
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -121,14 +122,24 @@ slang_targetinstall_deps = $(STATEDIR)/slang.compile
 
 $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install $(SLANG_DIR)/src/elfobjs/libslang.so.$(SLANG_VERSION) \
-		$(ROOTDIR)/usr/lib/
-	cd $(ROOTDIR)/usr/lib/ && \
-		ln -s libslang.so.$(SLANG_VERSION) libslang.so.1
-	cd $(ROOTDIR)/usr/lib/ && \
-		ln -s libslang.so.$(SLANG_VERSION) libslang.so
-	$(CROSSSTRIP) -S -R .note -R .comment \
-		$(ROOTDIR)/usr/lib/libslang.so.$(SLANG_VERSION)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,slang)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(SLANG_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0644, \
+		$(SLANG_DIR)/src/elfobjs/libslang.so.$(SLANG_VERSION), \
+		/usr/lib/libslang.so.$(SLANG_VERSION))
+	@$(call install_link, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so.1)
+	@$(call install_link, libslang.so.$(SLANG_VERSION), /usr/lib/libslang.so)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -137,6 +148,7 @@ $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps)
 
 slang_clean:
 	rm -rf $(STATEDIR)/slang.*
+	rm -rf $(IMAGEDIR)/slang_*
 	rm -rf $(SLANG_DIR)
 
 # vim: syntax=make
diff --git a/rules/sudo.make b/rules/sudo.make
index 25e0340c6..def0defd1 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: ipkgize
+
 #
 # We provide this package
 #
diff --git a/rules/sys-epoll-lib.make b/rules/sys-epoll-lib.make
index af81a8c4f..64e9b5267 100644
--- a/rules/sys-epoll-lib.make
+++ b/rules/sys-epoll-lib.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: ipkgize
+
 #
 # We provide this package
 #
@@ -77,7 +79,7 @@ SYS-EPOLL-LIB_MAKEVARS = \
 	$(CROSS_ENV) \
 	KERNELDIR=$(KERNEL_DIR) \
 	PREFIX=$(CROSS_LIB_DIR) \
-	XCFLAGS='$(strip $(subst ",,$(TARGET_CFLAGS)))'
+	XCFLAGS=$(call remove_quotes,$(TARGET_CFLAGS))
 
 $(STATEDIR)/sys-epoll-lib.prepare: $(sys-epoll-lib_prepare_deps)
 	@$(call targetinfo, $@)
@@ -127,6 +129,7 @@ $(STATEDIR)/sys-epoll-lib.targetinstall: $(sys-epoll-lib_targetinstall_deps)
 
 sys-epoll-lib_clean:
 	rm -rf $(STATEDIR)/sys-epoll-lib.*
+	rm -rf $(IMAGEDIR)/sys-epoll-lib_*
 	rm -rf $(SYS-EPOLL-LIB_DIR)
 
 # vim: syntax=make
diff --git a/rules/sysvinit.make b/rules/sysvinit.make
index 9d2239165..c8c2b417d 100644
--- a/rules/sysvinit.make
+++ b/rules/sysvinit.make
@@ -54,6 +54,7 @@ $(STATEDIR)/sysvinit.extract: $(sysvinit_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(SYSVINIT_DIR))
 	@$(call extract, $(SYSVINIT_SOURCE))
+	@$(call patchin, $(SYSVINIT))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -90,7 +91,7 @@ sysvinit_compile_deps = $(STATEDIR)/sysvinit.prepare
 
 $(STATEDIR)/sysvinit.compile: $(sysvinit_compile_deps)
 	@$(call targetinfo, $@)
-	$(SYSVINIT_PATH) $(SYSVINIT_ENV) make -C $(SYSVINIT_DIR)
+	cd $(SYSVINIT_DIR) && $(SYSVINIT_PATH) $(SYSVINIT_ENV) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -114,7 +115,22 @@ sysvinit_targetinstall_deps = $(STATEDIR)/sysvinit.compile
 
 $(STATEDIR)/sysvinit.targetinstall: $(sysvinit_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,sysvinit)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(SYSVINIT_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	# FIXME: this should be fixed
 	$(SYSVINIT_PATH) ROOT=$(ROOTDIR) make -C $(SYSVINIT_DIR) install
+	$(SYSVINIT_PATH) ROOT=$(IMAGEIR)/ipkg make -C $(SYSVINIT_DIR) install
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -123,6 +139,7 @@ $(STATEDIR)/sysvinit.targetinstall: $(sysvinit_targetinstall_deps)
 
 sysvinit_clean:
 	rm -rf $(STATEDIR)/sysvinit.*
+	rm -rf $(IMAGEDIR)/sysvinit_*
 	rm -rf $(SYSVINIT_DIR)
 
 # vim: syntax=make
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make
index 1d1179020..fce2a544e 100644
--- a/rules/tcpwrapper.make
+++ b/rules/tcpwrapper.make
@@ -19,12 +19,13 @@ endif
 #
 # Paths and names 
 #
-TCPWRAPPER			= tcp_wrappers_7.6
+TCPWRAPPER_VERSION		= 7.6
+TCPWRAPPER			= tcp_wrappers_$(TCPWRAPPER_VERSION)
 TCPWRAPPER_URL			= ftp://ftp.porcupine.org/pub/security/$(TCPWRAPPER).tar.gz
 TCPWRAPPER_SOURCE		= $(SRCDIR)/$(TCPWRAPPER).tar.gz
 TCPWRAPPER_DIR			= $(BUILDDIR)/$(TCPWRAPPER)
 
-TCPWRAPPER_PTXPATCH		= tcp_wrappers_7.6-ptx1
+TCPWRAPPER_PTXPATCH		= tcp_wrappers_$(TCPWRAPPER_VERSION)-ptx1
 TCPWRAPPER_PTXPATCH_URL		= http://www.pengutronix.de/software/ptxdist/temporary-src/$(TCPWRAPPER_PTXPATCH).diff
 TCPWRAPPER_PTXPATCH_SOURCE	= $(SRCDIR)/$(TCPWRAPPER_PTXPATCH).diff
 
@@ -56,6 +57,7 @@ $(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(TCPWRAPPER_DIR))
 	@$(call extract, $(TCPWRAPPER_SOURCE))
+	# FIXME: patch repository!
 	cd $(TCPWRAPPER_DIR) && patch -p1 < $(TCPWRAPPER_PTXPATCH_SOURCE)
 	touch $@
 
@@ -104,11 +106,20 @@ tcpwrapper_targetinstall: $(STATEDIR)/tcpwrapper.targetinstall
 
 $(STATEDIR)/tcpwrapper.targetinstall: $(STATEDIR)/tcpwrapper.install
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,tcpwrapper)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(TCPWRAPPER_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
 ifdef PTXCONF_TCPWRAPPER_INSTALL_TCPD
-	mkdir -p $(ROOTDIR)/usr/sbin
-	install $(TCPWRAPPER_DIR)/tcpd $(ROOTDIR)/usr/sbin
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/tcpd
+	@$(call install_copy, 0, 0, 0755, $(TCPWRAPPER_DIR)/tcpd, /usr/sbin/tcpd)
 endif
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -116,6 +127,8 @@ endif
 # ----------------------------------------------------------------------------
 
 tcpwrapper_clean: 
-	rm -rf $(STATEDIR)/tcpwrapper.* $(TCPWRAPPER_DIR)
+	rm -rf $(STATEDIR)/tcpwrapper.* 
+	rm -rf $(IMAGEDIR)/tcpwrapper_* 
+	rm -rf $(TCPWRAPPER_DIR)
 
 # vim: syntax=make
diff --git a/rules/termcap.make b/rules/termcap.make
index fbbad3108..9ef957235 100644
--- a/rules/termcap.make
+++ b/rules/termcap.make
@@ -104,7 +104,7 @@ termcap_compile_deps = $(STATEDIR)/termcap.prepare
 
 $(STATEDIR)/termcap.compile: $(termcap_compile_deps)
 	@$(call targetinfo, $@)
-	$(TERMCAP_PATH) make -C $(TERMCAP_DIR)
+	cd $(TERMCAP_DIR) && $(TERMCAP_PATH) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ termcap_install: $(STATEDIR)/termcap.install
 
 $(STATEDIR)/termcap.install: $(STATEDIR)/termcap.compile
 	@$(call targetinfo, $@)
-	$(TERMCAP_PATH) make -C $(TERMCAP_DIR) install
+	cd $(TERMCAP_DIR) && $(TERMCAP_PATH) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -128,9 +128,18 @@ termcap_targetinstall_deps = $(STATEDIR)/termcap.install
 
 $(STATEDIR)/termcap.targetinstall: $(termcap_targetinstall_deps)
 	@$(call targetinfo, $@)
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,termcap)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(TERMCAP_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
 ifdef PTXCONF_TERMCAP_TERMCAP
-	install -d $(ROOTDIR)/etc
-	install $(TERMCAP_DIR)/termcap.src $(ROOTDIR)/etc
+	@$(call install_copy, 0, 0, 0755, $(TERMCAP_DIR)/termcap.src, /etc/termcap.src,n)
 endif
 	touch $@
 
@@ -140,6 +149,7 @@ endif
 
 termcap_clean:
 	rm -rf $(STATEDIR)/termcap.*
+	rm -rf $(IMAGEDIR)/termcap_*
 	rm -rf $(TERMCAP_DIR)
 
 # vim: syntax=make
diff --git a/rules/thttpd.make b/rules/thttpd.make
index 9acee68de..869dea6de 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -54,6 +54,7 @@ $(STATEDIR)/thttpd.extract: $(thttpd_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(THTTPD_DIR))
 	@$(call extract, $(THTTPD_SOURCE))
+	@$(call patchin, $(THTTPD))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -121,10 +122,19 @@ thttpd_targetinstall_deps = $(STATEDIR)/thttpd.compile
 
 $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/sbin
-	cd $(THTTPD_DIR) && \
-	$(INSTALL) -m 555 thttpd $(ROOTDIR)/sbin
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/thttpd
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,thttpd)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(THTTPD_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0555, (THTTPD_DIR)/thttpd, /sbin/thttpd)
+
+	@$(call install_finish)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -133,6 +143,7 @@ $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps)
 
 thttpd_clean:
 	rm -rf $(STATEDIR)/thttpd.*
+	rm -rf $(IMAGEDIR)/thttpd_*
 	rm -rf $(THTTPD_DIR)
 
 # vim: syntax=make
diff --git a/rules/tinylogin.make b/rules/tinylogin.make
index aa02be8ff..ea2576201 100644
--- a/rules/tinylogin.make
+++ b/rules/tinylogin.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: do someting on targetinstall 
+
 #
 # We provide this package
 #
@@ -19,7 +21,8 @@ endif
 #
 # Paths and names 
 #
-TINYLOGIN		= tinylogin-1.4.tar.bz2
+TINYLOGIN_VERSION	= 1.4
+TINYLOGIN		= tinylogin-$(TINYLOGIN_VERSION).tar.bz2
 TINYLOGIN_URL		= http://tinylogin.busybox.net/downloads/$(TINYLOGIN).tar.bz2
 TINYLOGIN_SOURCE	= $(SRCDIR)/$(TINYLOGIN).tar.bz2
 TINYLOGIN_DIR		= $(BUILDDIR)/$(TINYLOGIN)
@@ -50,6 +53,7 @@ $(STATEDIR)/tinylogin.extract: $(STATEDIR)/tinylogin.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(TINYLOGIN_DIR))
 	@$(call extract, $(TINYLOGIN_SOURCE))
+	@$(call patchin, $(TINYLOGIN))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -82,7 +86,7 @@ tinylogin_compile_deps =  $(STATEDIR)/tinylogin.prepare
 
 $(STATEDIR)/tinylogin.compile: $(tinylogin_compile_deps) 
 	@$(call targetinfo, $@)
-	$(TINYLOGIN_PATH) make -C $(TINYLOGIN_DIR) $(TINYLOGIN_MAKEVARS)
+	cd $(TINYLOGIN_DIR) && $(TINYLOGIN_PATH) make $(TINYLOGIN_MAKEVARS)
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -110,7 +114,8 @@ $(STATEDIR)/tinylogin.targetinstall: $(STATEDIR)/tinylogin.install
 # ----------------------------------------------------------------------------
 
 tinylogin_clean:
-	-rm -rf $(STATEDIR)/tinylogin*
-	-rm -rf $(TINYLOGIN_DIR)
+	rm -rf $(STATEDIR)/tinylogin.*
+	rm -rf $(IMAGEDIR)/tinylogin_*
+	rm -rf $(TINYLOGIN_DIR)
 
-# vim: syntax=make
\ No newline at end of file
+# vim: syntax=make
diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make
index 4e8506bdb..fc66d25e2 100644
--- a/rules/troll-ftpd.make
+++ b/rules/troll-ftpd.make
@@ -115,9 +115,20 @@ troll-ftpd_targetinstall_deps = $(STATEDIR)/troll-ftpd.compile
 
 $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/sbin
-	cp $(TROLL-FTPD_DIR)/ftpd $(ROOTDIR)/sbin/
-	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/ftpd
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,trollftpd)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(TROLLFTPD_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	@$(call install_copy, 0, 0, 0755, (TROLL-FTPD_DIR)/ftpd, /sbin/ftpd)
+
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -126,6 +137,7 @@ $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps)
 
 troll-ftpd_clean:
 	rm -rf $(STATEDIR)/troll-ftpd.*
+	rm -rf $(IMAGEDIR)/troll-ftpd_*
 	rm -rf $(TROLL-FTPD_DIR)
 
 # vim: syntax=make
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 6c2b9bb97..131866ff9 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -157,8 +157,17 @@ uclibc_targetinstall_deps = $(STATEDIR)/uclibc.install
 
 $(STATEDIR)/uclibc.targetinstall: $(uclibc_targetinstall_deps)
 	@$(call targetinfo, $@)
-	mkdir -p $(ROOTDIR)/lib
 
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,uclibc)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(UCLIBC_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+	
+	# FIXME: ipkgize	
 	cp -d $(CROSS_LIB_DIR)/lib/ld-uClibc[-.]*so* $(ROOTDIR)/lib/
 
 	cp -d $(CROSS_LIB_DIR)/lib/libuClibc[-.]*so* $(ROOTDIR)/lib/
@@ -194,6 +203,8 @@ endif
 ifdef PTXCONF_UCLIBC_UTIL
 	cp -d $(CROSS_LIB_DIR)/lib/libutil[-.]*so* $(ROOTDIR)/lib/
 endif
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -201,7 +212,8 @@ endif
 # ----------------------------------------------------------------------------
 
 uclibc_clean: 
-	-rm -rf $(STATEDIR)/uclibc*
-	-rm -rf $(UCLIBC_DIR)
+	rm -rf $(STATEDIR)/uclibc.*
+	rm -rf $(IMAGEDIR)/uclibc_*
+	rm -rf $(UCLIBC_DIR)
 
 # vim: syntax=make
diff --git a/rules/wireless.make b/rules/wireless.make
index eb8001c79..8356f6e93 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -53,6 +53,7 @@ $(STATEDIR)/wireless.extract: $(wireless_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(WIRELESS_DIR))
 	@$(call extract, $(WIRELESS_SOURCE))
+	@$(call patchin, $(WIRELESS))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -102,25 +103,33 @@ wireless_targetinstall: $(STATEDIR)/wireless.targetinstall
 
 $(STATEDIR)/wireless.targetinstall: $(STATEDIR)/wireless.install
 	@$(call targetinfo, $@)
-	install -d $(ROOTDIR)/usr/sbin 
-	install $(WIRELESS_DIR)/iwconfig $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwconfig
-	install $(WIRELESS_DIR)/iwlist   $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwlist
-	install $(WIRELESS_DIR)/iwpriv   $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwpriv
-	install $(WIRELESS_DIR)/iwspy    $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwspy
-	install $(WIRELESS_DIR)/iwgetid  $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwgetid
-	install $(WIRELESS_DIR)/iwevent  $(ROOTDIR)/usr/sbin
-	$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/iwevent
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,wireless)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(WIRELESS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwconfig, /usr/sbin/iwconfig)
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwlist, /usr/sbin/iwlist)
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwpriv, /usr/sbin/iwpriv)
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwspy, /usr/sbin/iwspy)
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwgetid, /usr/sbin/iwgetid)
+	@$(call install_copy, 0, 0, 0755, $(WIRELESS_DIR)/iwevent, /usr/sbin/iwevent)
+
+	@$(call install_finish)
+	
 	touch $@
 # ----------------------------------------------------------------------------
 # Clean
 # ----------------------------------------------------------------------------
 
 wireless_clean: 
-	rm -rf $(STATEDIR)/wireless.* $(WIRELESS_DIR)
+	rm -rf $(STATEDIR)/wireless.* 
+	rm -rf $(IMAGEDIR)/wireless_* 
+	rm -rf $(WIRELESS_DIR)
 
 # vim: syntax=make
diff --git a/rules/wxWindows.make b/rules/wxWindows.make
index 3820c37cc..cf445f4f6 100644
--- a/rules/wxWindows.make
+++ b/rules/wxWindows.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: ipkgize
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/wxWindows.extract: $(wxWindows_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(WXWINDOWS_DIR))
 	@$(call extract, $(WXWINDOWS_SOURCE))
+	@$(call patchin, $(WXWINDOWS))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -111,7 +114,7 @@ wxWindows_compile_deps =  $(STATEDIR)/wxWindows.prepare
 
 $(STATEDIR)/wxWindows.compile: $(wxWindows_compile_deps)
 	@$(call targetinfo, $@)
-	$(WXWINDOWS_PATH) $(WXWINDOWS_ENV) make -C $(WXWINDOWS_DIR)
+	cd $(WXWINDOWS_DIR) && $(WXWINDOWS_PATH) $(WXWINDOWS_ENV) make
 	touch $@
 
 
@@ -143,6 +146,7 @@ $(STATEDIR)/wxWindows.targetinstall: $(wxWindows_targetinstall_deps)
 
 wxWindows_clean:
 	rm -rf $(STATEDIR)/wxWindows.*
+	rm -rf $(IMAGEDIR)/wxWindows_*
 	rm -rf $(WXWINDOWS_DIR)
 
 # vim: syntax=make
diff --git a/rules/xalf.make b/rules/xalf.make
index cc21769d2..6743469b7 100644
--- a/rules/xalf.make
+++ b/rules/xalf.make
@@ -54,6 +54,7 @@ $(STATEDIR)/xalf.extract: $(xalf_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(XALF_DIR))
 	@$(call extract, $(XALF_SOURCE))
+	@$(call patchin, $(XALF))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -124,8 +125,20 @@ xalf_targetinstall_deps	=  $(STATEDIR)/xalf.compile
 
 $(STATEDIR)/xalf.targetinstall: $(xalf_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install $(XALF_DIR)/src/xalf $(ROOTDIR)/usr/bin
-	$(CROSSSTRIP) $(ROOTDIR)/usr/bin/xalf
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,xalf)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(XALF_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(XALF_DIR)/src/xalf, /usr/bin/xalf)
+	
+	@$(call install_finish)
+
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -134,6 +147,7 @@ $(STATEDIR)/xalf.targetinstall: $(xalf_targetinstall_deps)
 
 xalf_clean:
 	rm -rf $(STATEDIR)/xalf.*
+	rm -rf $(IMAGEDIR)/xalf_*
 	rm -rf $(XALF_DIR)
 
 # vim: syntax=make
diff --git a/rules/xfree430.make b/rules/xfree430.make
index f9867672e..aced39a8b 100644
--- a/rules/xfree430.make
+++ b/rules/xfree430.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: replace by xlibs/xserver (or ipkgize it)
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-damageext.make b/rules/xlibs-damageext.make
index 71bf23a2f..6a41b3ee9 100644
--- a/rules/xlibs-damageext.make
+++ b/rules/xlibs-damageext.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-fixesext.make b/rules/xlibs-fixesext.make
index 897abdd16..e8dcfe120 100644
--- a/rules/xlibs-fixesext.make
+++ b/rules/xlibs-fixesext.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-randr.make b/rules/xlibs-randr.make
index 718cae076..e01860776 100644
--- a/rules/xlibs-randr.make
+++ b/rules/xlibs-randr.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-recordext.make b/rules/xlibs-recordext.make
index 0aa52bc6a..c15eaf7cc 100644
--- a/rules/xlibs-recordext.make
+++ b/rules/xlibs-recordext.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-render.make b/rules/xlibs-render.make
index 316590253..e56d65c2e 100644
--- a/rules/xlibs-render.make
+++ b/rules/xlibs-render.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-xextensions.make b/rules/xlibs-xextensions.make
index 93a22253e..33cd281e4 100644
--- a/rules/xlibs-xextensions.make
+++ b/rules/xlibs-xextensions.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-xproto.make b/rules/xlibs-xproto.make
index 70d99dad5..3441c7bb0 100644
--- a/rules/xlibs-xproto.make
+++ b/rules/xlibs-xproto.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xlibs-xtrans.make b/rules/xlibs-xtrans.make
index 3aedafd82..32149dfc6 100644
--- a/rules/xlibs-xtrans.make
+++ b/rules/xlibs-xtrans.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xserver.make b/rules/xserver.make
index e9839d587..e499859bb 100644
--- a/rules/xserver.make
+++ b/rules/xserver.make
@@ -9,6 +9,8 @@
 # see the README file.
 #
 
+# FIXME: RSC: do something on targetinstall
+
 #
 # We provide this package
 #
diff --git a/rules/xvkbd.make b/rules/xvkbd.make
index 67fc82589..3eee1737a 100644
--- a/rules/xvkbd.make
+++ b/rules/xvkbd.make
@@ -90,7 +90,7 @@ xvkbd_compile_deps =  $(STATEDIR)/xvkbd.prepare
 
 $(STATEDIR)/xvkbd.compile: $(xvkbd_compile_deps)
 	@$(call targetinfo, $@)
-	$(XVKBD_PATH) $(XVKBD_ENV) make -C $(XVKBD_DIR)
+	cd $(XVKBD_DIR) && $(XVKBD_PATH) $(XVKBD_ENV) make
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -101,7 +101,7 @@ xvkbd_install: $(STATEDIR)/xvkbd.install
 
 $(STATEDIR)/xvkbd.install: $(STATEDIR)/xvkbd.compile
 	@$(call targetinfo, $@)
-	$(XVKBD_PATH) $(XVKBD_ENV) make -C $(XVKBD_DIR) install
+	cd $(XVKBD_DIR) && $(XVKBD_PATH) $(XVKBD_ENV) make install
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -114,10 +114,25 @@ xvkbd_targetinstall_deps	=  $(STATEDIR)/xvkbd.compile
 
 $(STATEDIR)/xvkbd.targetinstall: $(xvkbd_targetinstall_deps)
 	@$(call targetinfo, $@)
-	install $(XVKBD_DIR)/xvkbd $(ROOTDIR)/usr/X11R6/bin/
-	install $(XVKBD_DIR)/XVkbd-common.ad $(ROOTDIR)/etc/X11/app-defaults/XVkbd-common
-	install $(XVKBD_DIR)/XVkbd-german.ad $(ROOTDIR)/etc/X11/app-defaults/XVkbd-german
+
+	@$(call install_init,default)
+	@$(call install_fixup,PACKAGE,xvkbd)
+	@$(call install_fixup,PRIORITY,optional)
+	@$(call install_fixup,VERSION,$(COREUTILS_VERSION))
+	@$(call install_fixup,SECTION,base)
+	@$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,DEPENDS,libc)
+	@$(call install_fixup,DESCRIPTION,missing)
+
+	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/xvkbd, /usr/X11R6/bin/xvkbd)
+	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-common.ad, /etc/X11/app-defaults/XVkbd-common)
+	@$(call install_copy, 0, 0, 0755, $(XVKBD_DIR)/XVkbd-german.ad, /etc/X11/app-defaults/XVkbd-german)
 	echo '#include "XVkbd-german"' > $(ROOTDIR)/etc/X11/app-defaults/XVkbd
+	# FIXME: fix permissions
+	echo '#include "XVkbd-german"' > $(IMAGEIR)/ipkg/etc/X11/app-defaults/XVkbd
+
+	@$(call install_finish)
+	
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -126,6 +141,7 @@ $(STATEDIR)/xvkbd.targetinstall: $(xvkbd_targetinstall_deps)
 
 xvkbd_clean:
 	rm -rf $(STATEDIR)/xvkbd.*
+	rm -rf $(IMAGEDIR)/xvkbd_*
 	rm -rf $(XVKBD_DIR)
 
 # vim: syntax=make
diff --git a/rules/zebra.make b/rules/zebra.make
index 2073004ff..9f8b357af 100644
--- a/rules/zebra.make
+++ b/rules/zebra.make
@@ -10,6 +10,8 @@
 # see the README file.
 #
 
+# FIXME: ipkgize
+
 #
 # We provide this package
 #
@@ -55,6 +57,7 @@ $(STATEDIR)/zebra.extract: $(zebra_extract_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(ZEBRA_DIR))
 	@$(call extract, $(ZEBRA_SOURCE))
+	@$(call patchin, $(ZEBRA))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -129,6 +132,8 @@ $(STATEDIR)/zebra.targetinstall: $(STATEDIR)/zebra.install
 # ----------------------------------------------------------------------------
 
 zebra_clean: 
-	rm -rf $(STATEDIR)/zebra.* $(ZEBRA_DIR)
+	rm -rf $(STATEDIR)/zebra.* 
+	rm -rf $(IMAGEDIR)/zebra_* 
+	rm -rf $(ZEBRA_DIR)
 
 # vim: syntax=make