diff --git a/make/ext2root.mk b/make/ext2root.mk
index e56b2fe8d..ad0dd1db5 100644
--- a/make/ext2root.mk
+++ b/make/ext2root.mk
@@ -36,7 +36,7 @@ GENEXT2_REALSIZE=$(subst total,, $(shell du $(TARGET_DIR) -s -c -k | grep total
 GENEXT2_SIZE=$(shell expr $(GENEXT2_REALSIZE) + $(GENEXT2_ADDTOROOTSIZE))
 # We currently add about 400 device nodes, so add that into the total
 GENEXT2_INODES=$(shell expr $(shell find $(TARGET_DIR) | wc -l) + 400)
-#GENEXT2_SIZE=100000
+GENEXT2_SIZE=100000
 
 ext2root: genext2fs
 	-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
diff --git a/make/gcc_target.mk b/make/gcc_target.mk
index 20ebc5b25..d98b3d31a 100644
--- a/make/gcc_target.mk
+++ b/make/gcc_target.mk
@@ -22,7 +22,6 @@
 # hacking on the toolchain...
 #
 #############################################################
-GNU_TARGET_NAME:=$(ARCH)-linux
 TARGET_LANGUAGES:=c,c++
 
 # If you want multilib enabled, enable this...
@@ -52,21 +51,27 @@ $(BINUTILS_DIR2)/.configured:
 	#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../lib)
 	#(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include)
 	(cd $(TARGET_DIR)/usr/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
-	(cd $(BINUTILS_DIR2); PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
+	(cd $(BINUTILS_DIR2); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
+		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
+		CC=$(TARGET_CROSS)gcc \
 		$(BINUTILS_DIR)/configure \
+		--target=$(GNU_TARGET_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
-		--includedir=/usr/include \
 		--libdir=/usr/lib \
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--with-gxx-include-dir=/usr/include/c++ \
-		--disable-shared $(MULTILIB) );
+		--includedir=$(STAGING_DIR)/include \
+		--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
+		--disable-shared $(MULTILIB) \
+		--program-prefix="" \
+	);
 	touch $(BINUTILS_DIR2)/.configured
 
 $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured
@@ -75,7 +80,11 @@ $(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured
 		CC=$(TARGET_CROSS)gcc -C $(BINUTILS_DIR2)
 
 $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump 
-	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) \
+	PATH=$(STAGING_DIR)/bin:$$PATH CC=$(HOSTCC) GCC_FOR_TARGET=$(TARGET_CROSS)gcc \
+	    AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
+	    LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
+	    CC_FOR_TARGET=$(TARGET_CROSS)gcc \
+	    $(MAKE) \
 	    prefix=$(TARGET_DIR)/usr \
 	    exec_prefix=$(TARGET_DIR)/usr \
 	    bindir=$(TARGET_DIR)/usr/bin \
@@ -169,24 +178,53 @@ $(GCC_BUILD_DIR3)/.gcc_build_hacks:
 
 $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.gcc_build_hacks
 	(cd $(GCC_BUILD_DIR3); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
-		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld CC=$(TARGET_CROSS)gcc \
-		$(GCC_DIR)/configure \
+		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
+		CC=$(TARGET_CROSS)gcc $(GCC_DIR)/configure \
+		--target=$(GNU_TARGET_NAME) \
 		--prefix=$(TARGET_DIR)/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
+		--with-local-prefix=/usr/local \
+		--libdir=/usr/lib \
+		--includedir=$(STAGING_DIR)/include \
+		--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
+		--oldincludedir=$(STAGING_DIR)/include \
 		--enable-shared $(MULTILIB) \
-		--enable-target-optspace --disable-nls --with-gnu-ld \
-		--enable-languages=$(TARGET_LANGUAGES) --disable-__cxa_atexit );
+		--enable-target-optspace --disable-nls \
+		--with-gnu-ld --disable-__cxa_atexit \
+		--enable-languages=$(TARGET_LANGUAGES) \
+		$(EXTRA_GCC_CONFIG_OPTIONS) \
+		--program-prefix="" \
+	);
+		#$(GNU_TARGET_NAME) \
+		#--target=$(GNU_TARGET_NAME) \
+		#
 	touch $(GCC_BUILD_DIR3)/.configured
 
 $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
-	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) AR=$(TARGET_CROSS)ar \
-		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld \
-		CC=$(TARGET_CROSS)gcc -C $(GCC_BUILD_DIR3)
+	PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
+	    AR=$(TARGET_CROSS)ar RANLIB=$(TARGET_CROSS)ranlib \
+	    LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
+	    AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
+	    LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
+	    CC_FOR_TARGET=$(TARGET_CROSS)gcc LIBGCC2_INCLUDES=$(TARGET_DIR)/usr/include \
+	    $(MAKE) -C $(GCC_BUILD_DIR3)
 	touch $(GCC_BUILD_DIR3)/.compiled
 
 $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
-	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) \
+	PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CROSS)gcc \
+	    AR=$(TARGET_CROSS)ar RANLIB=$(TARGET_CROSS)ranlib \
+	    LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
+	    AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
+	    LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
+	    CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) \
 	    prefix=$(TARGET_DIR)/usr \
 	    exec_prefix=$(TARGET_DIR)/usr \
 	    bindir=$(TARGET_DIR)/usr/bin \
diff --git a/make/hotplug.mk b/make/hotplug.mk
new file mode 100644
index 000000000..2c3428d98
--- /dev/null
+++ b/make/hotplug.mk
@@ -0,0 +1,39 @@
+#############################################################
+#
+# hotplug support
+#
+#############################################################
+HOTPLUG_SOURCE=diethotplug-0.4.tar.gz
+HOTPLUG_SITE=http://telia.dl.sourceforge.net/sourceforge/linux-hotplug
+HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4
+HOTPLUG_PATCH=$(SOURCE_DIR)/hotplug.patch
+
+$(DL_DIR)/$(HOTPLUG_SOURCE):
+	$(WGET) -P $(DL_DIR) $(HOTPLUG_SITE)/$(HOTPLUG_SOURCE)
+
+$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE) $(HOTPLUG_PATCH)
+	zcat $(DL_DIR)/$(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	cat $(HOTPLUG_PATCH) | patch -p1 -d $(HOTPLUG_DIR)
+
+$(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
+	$(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \
+	    KERNEL_INCLUDE_DIR=$(STAGING_DIR)/include \
+	    TARGET_DIR=$(TARGET_DIR) -C $(HOTPLUG_DIR);
+	$(STRIP) $(HOTPLUG_DIR)/hotplug;
+	touch -c $(HOTPLUG_DIR)/hotplug
+
+$(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug
+	cp $(HOTPLUG_DIR)/hotplug $(TARGET_DIR)/sbin/hotplug;
+	touch -c $(TARGET_DIR)/sbin/hotplug
+
+hotplug: uclibc $(TARGET_DIR)/sbin/hotplug
+
+ext2root-source: $(DL_DIR)/$(HOTPLUG_SOURCE)
+
+hotplug-clean:
+	rm -f $(TARGET_DIR)/sbin/hotplug
+	-$(MAKE) -C $(HOTPLUG_DIR) clean
+
+hotplug-dirclean:
+	rm -rf $(HOTPLUG_DIR)
+
diff --git a/make/jpeg.mk b/make/jpeg.mk
new file mode 100644
index 000000000..92ecb7817
--- /dev/null
+++ b/make/jpeg.mk
@@ -0,0 +1,68 @@
+#############################################################
+#
+# jpeg (libraries needed by some apps)
+#
+#############################################################
+# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+JPEG_DIR=$(BUILD_DIR)/jpeg-6b
+JPEG_SITE:=ftp://ftp.uu.net/graphics/jpeg/
+JPEG_SOURCE=jpegsrc.v6b.tar.gz
+JPEG_CAT:=zcat
+
+$(DL_DIR)/$(JPEG_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(JPEG_SITE)/$(JPEG_SOURCE)
+
+jpeg-source: $(DL_DIR)/$(JPEG_SOURCE)
+
+$(JPEG_DIR)/.unpacked: $(DL_DIR)/$(JPEG_SOURCE)
+	$(JPEG_CAT) $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(JPEG_DIR)/.unpacked
+
+$(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
+	zcat $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	(cd $(JPEG_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--enable-shared \
+	);
+	touch  $(JPEG_DIR)/.configured
+
+$(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured
+	$(MAKE) -C $(JPEG_DIR) CC=$(TARGET_CROSS)gcc all
+	$(MAKE) -C $(JPEG_DIR) install-lib
+	$(MAKE) -C $(JPEG_DIR) install-headers
+
+$(TARGET_DIR)/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0
+	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/lib/
+
+jpeg: uclibc $(TARGET_DIR)/lib/libjpeg.so.62.0.0
+
+jpeg-clean:
+	-$(MAKE) -C $(JPEG_DIR) clean
diff --git a/make/links.mk b/make/links.mk
index 675aea94a..9ce78d59b 100644
--- a/make/links.mk
+++ b/make/links.mk
@@ -28,7 +28,7 @@ $(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
-		--localstatedir=/var \
+		--localstatedir=/tmp \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--disable-nls \
diff --git a/make/lrzsz.mk b/make/lrzsz.mk
new file mode 100644
index 000000000..bcb4293f9
--- /dev/null
+++ b/make/lrzsz.mk
@@ -0,0 +1,74 @@
+#############################################################
+#
+# lrzsz (provided zmodem)
+#
+#############################################################
+# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+LRZSZ_SITE:=http://www.ohse.de/uwe/releases
+LRZSZ_SOURCE:=lrzsz-0.12.20.tar.gz
+LRZSZ_DIR:=$(BUILD_DIR)/lrzsz-0.12.20
+
+$(DL_DIR)/$(LRZSZ_SOURCE):
+	$(WGET) -P $(DL_DIR) $(LRZSZ_SITE)/$(LRZSZ_SOURCE)
+
+lrzsz-source: $(DL_DIR)/$(LRZSZ_SOURCE)
+
+$(LRZSZ_DIR)/.unpacked: $(DL_DIR)/$(LRZSZ_SOURCE)
+	zcat $(DL_DIR)/$(LRZSZ_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch  $(LRZSZ_DIR)/.unpacked
+
+$(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked
+	(cd $(LRZSZ_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/tmp \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+		--disable-timesync \
+	);
+	perl -i -p -e "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
+	perl -i -p -e "s~(#define ENABLE_SYSLOG.*)~/* \1 */~;" $(LRZSZ_DIR)/config.h
+	touch  $(LRZSZ_DIR)/.configured
+
+$(LRZSZ_DIR)/src/lrz: $(LRZSZ_DIR)/.configured
+	$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(LRZSZ_DIR)
+	$(STRIP) $(LRZSZ_DIR)/src/lrz $(LRZSZ_DIR)/src/lsz
+
+$(TARGET_DIR)/usr/bin/rz: $(LRZSZ_DIR)/src/lrz
+	cp $(LRZSZ_DIR)/src/lrz $(TARGET_DIR)/usr/bin/rz
+	cp $(LRZSZ_DIR)/src/lsz $(TARGET_DIR)/usr/bin/sz
+
+lrzsz: uclibc $(TARGET_DIR)/usr/bin/rz
+
+lrzsz-clean:
+	rm -f $(TARGET_DIR)/usr/bin/rz
+	-$(MAKE) -C $(LRZSZ_DIR) clean
+
+lrzsz-dirclean:
+	rm -rf $(LRZSZ_DIR)
diff --git a/make/make.mk b/make/make.mk
index 718af3090..539dd474d 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -5,8 +5,8 @@
 #############################################################
 GNUMAKE_SOURCE:=make-3.80.tar.bz2
 GNUMAKE_SITE:=ftp://ftp.gnu.org/gnu/make
-GNUMAKE_CAT:=bzcat
 GNUMAKE_DIR:=$(BUILD_DIR)/make-3.80
+GNUMAKE_CAT:=bzcat
 GNUMAKE_BINARY:=make
 GNUMAKE_TARGET_BINARY:=usr/bin/make
 
diff --git a/make/microcom.mk b/make/microcom.mk
new file mode 100644
index 000000000..e0c751262
--- /dev/null
+++ b/make/microcom.mk
@@ -0,0 +1,60 @@
+#############################################################
+#
+# microcom terminal emulator
+#
+# Maintainer: Tim Riker <Tim@Rikers.org>
+#
+#############################################################
+# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+# TARGETS
+# http://microcom.port5.com/m102.tar.gz
+MICROCOM_SITE:=http://microcom.port5.com/
+MICROCOM_SOURCE:=m102.tar.gz
+MICROCOM_DIR:=$(BUILD_DIR)/microcom-1.02
+
+$(DL_DIR)/$(MICROCOM_SOURCE):
+	$(WGET) -P $(DL_DIR) $(MICROCOM_SITE)/$(MICROCOM_SOURCE)
+
+microcom-source: $(DL_DIR)/$(MICROCOM_SOURCE)
+
+$(MICROCOM_DIR)/.unpacked: $(DL_DIR)/$(MICROCOM_SOURCE)
+	zcat $(DL_DIR)/$(MICROCOM_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch  $(MICROCOM_DIR)/.unpacked
+
+$(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
+	mkdir -p $(MICROCOM_DIR)
+	zcat $(DL_DIR)/$(MICROCOM_SOURCE) | tar -C $(MICROCOM_DIR) -xvf -
+	perl -i -p -e 's~gcc~${TARGET_CC}~' $(MICROCOM_DIR)/Makefile
+	touch  $(MICROCOM_DIR)/.configured
+
+$(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
+	$(MAKE) -C $(MICROCOM_DIR)
+
+$(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom
+	install -c $(MICROCOM_DIR)/microcom $(TARGET_DIR)/usr/bin/microcom
+
+microcom-clean: 
+	rm $(MICROCOM_DIR)/*.o
+
+microcom-dirclean: 
+	rm -rf $(MICROCOM_DIR) 
+
+microcom: uclibc $(TARGET_DIR)/usr/bin/microcom 
+
diff --git a/make/mkdosfs.mk b/make/mkdosfs.mk
new file mode 100644
index 000000000..a3132686b
--- /dev/null
+++ b/make/mkdosfs.mk
@@ -0,0 +1,44 @@
+#############################################################
+#
+# mkdosfs
+#
+#############################################################
+MKDOSFS_SOURCE=dosfstools-2.8.src.tar.gz
+MKDOSFS_SITE=http://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools
+MKDOSFS_DIR=$(BUILD_DIR)/dosfstools-2.8
+MKDOSFS_CAT:=zcat
+MKDOSFS_BINARY:=mkdosfs/mkdosfs
+MKDOSFS_TARGET_BINARY:=sbin/mkdosfs
+ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+MKDOSFS_CFLAGS="-Os -g -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64"
+else
+MKDOSFS_CFLAGS="-Os -g"
+endif
+
+$(DL_DIR)/$(MKDOSFS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(MKDOSFS_SITE)/$(MKDOSFS_SOURCE)
+
+mkdosfs-source: $(DL_DIR)/$(MKDOSFS_SOURCE)
+
+$(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE)
+	$(MKDOSFS_CAT) $(DL_DIR)/$(MKDOSFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(MKDOSFS_DIR)/.unpacked
+
+$(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked
+	$(MAKE) CFLAGS=$(MKDOSFS_CFLAGS) CC=$(TARGET_CC1) -C $(MKDOSFS_DIR);
+	$(STRIP) $(MKDOSFS_DIR)/mkdosfs/mkdosfs;
+	touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs
+
+$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(MKDOSFS_DIR)/$(MKDOSFS_BINARY)
+	cp -a $(MKDOSFS_DIR)/$(MKDOSFS_BINARY) $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
+	touch -c $(TARGET_DIR)/sbin/mkdosfs
+
+mkdosfs: uclibc $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
+
+mkdosfs-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKDOSFS_DIR) uninstall
+	-$(MAKE) -C $(MKDOSFS_DIR) clean
+
+mkdosfs-dirclean:
+	rm -rf $(MKDOSFS_DIR)
+
diff --git a/make/mke2fs.mk b/make/mke2fs.mk
new file mode 100644
index 000000000..38a593bc2
--- /dev/null
+++ b/make/mke2fs.mk
@@ -0,0 +1,69 @@
+#############################################################
+#
+# mke2fs
+#
+#############################################################
+MKE2FS_SOURCE=e2fsprogs-1.27.tar.gz
+MKE2FS_SITE=http://telia.dl.sourceforge.net/sourceforge/e2fsprogs
+MKE2FS_DIR=$(BUILD_DIR)/e2fsprogs-1.27
+MKE2FS_CAT:=zcat
+MKE2FS_BINARY:=misc/mke2fs
+MKE2FS_TARGET_BINARY:=sbin/mke2fs
+
+$(DL_DIR)/$(MKE2FS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(MKE2FS_SITE)/$(MKE2FS_SOURCE)
+
+mke2fs-source: $(DL_DIR)/$(MKE2FS_SOURCE)
+
+$(MKE2FS_DIR)/.unpacked: $(DL_DIR)/$(MKE2FS_SOURCE)
+	$(MKE2FS_CAT) $(DL_DIR)/$(MKE2FS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(MKE2FS_DIR)/.unpacked
+
+$(MKE2FS_DIR)/.configured: $(MKE2FS_DIR)/.unpacked
+	(cd $(MKE2FS_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--with-cc=$(TARGET_CC1) \
+		--with-linker=$(TARGET_CROSS)ld \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-elf-shlibs --disable-swapfs \
+		--disable-debugfs --disable-imager \
+		--disable-resizer --disable-fsck \
+		--without-catgets --disable-nls \
+	);
+	touch  $(MKE2FS_DIR)/.configured
+
+$(MKE2FS_DIR)/$(MKE2FS_BINARY): $(MKE2FS_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(MKE2FS_DIR)
+	$(STRIP) $(MKE2FS_DIR)/misc/mke2fs $(MKE2FS_DIR)/misc/badblocks;
+	touch -c $(MKE2FS_DIR)/misc/mke2fs
+
+$(TARGET_DIR)/$(MKE2FS_TARGET_BINARY): $(MKE2FS_DIR)/$(MKE2FS_BINARY)
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKE2FS_DIR) install
+	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+	# Only install a few selected items...
+	cp -dpf $(MKE2FS_DIR)/misc/mke2fs $(TARGET_DIR)/sbin/mke2fs;
+	cp -dpf $(MKE2FS_DIR)/misc/badblocks $(TARGET_DIR)/sbin/badblocks;
+	touch -c $(TARGET_DIR)/sbin/mke2fs
+
+mke2fs: uclibc $(TARGET_DIR)/$(MKE2FS_TARGET_BINARY)
+
+mke2fs-clean:
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(MKE2FS_DIR) uninstall
+	rm -f $(TARGET_DIR)/sbin/mke2fs $(TARGET_DIR)/sbin/badblocks;
+	-$(MAKE) -C $(MKE2FS_DIR) clean
+
+mke2fs-dirclean:
+	rm -rf $(MKE2FS_DIR)
+
diff --git a/make/netkitbase.mk b/make/netkitbase.mk
new file mode 100644
index 000000000..95918c81f
--- /dev/null
+++ b/make/netkitbase.mk
@@ -0,0 +1,74 @@
+#############################################################
+#
+# netkitbase
+#
+#############################################################
+NETKITBASE_SOURCE:=netkit-base-0.17.tar.gz
+NETKITBASE_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-0.17
+NETKITBASE_CAT:=bzcat
+NETKITBASE_BINARY:=inetd/inetd
+NETKITBASE_TARGET_BINARY:=usr/sbin/inetd
+
+$(DL_DIR)/$(NETKITBASE_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(NETKITBASE_SITE)/$(NETKITBASE_SOURCE)
+
+netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE)
+
+$(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
+	$(NETKITBASE_CAT) $(DL_DIR)/$(NETKITBASE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	# use ANSI syntax
+	perl -i -p -e "s/main\(\)/main(void)/;" $(NETKITBASE_DIR)/configure
+	# don't try to run cross compiled binaries while configuring things
+	perl -i -p -e "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
+	touch $(NETKITBASE_DIR)/.unpacked
+
+$(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked
+	(cd $(NETKITBASE_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+		--installroot=$(TARGET_DIR) \
+		--with-c-compiler=$(TARGET_CC) \
+	);
+	touch  $(NETKITBASE_DIR)/.configured
+
+$(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR)
+	$(STRIP) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
+
+$(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY)
+	# Only install a few selected items...
+	mkdir -p $(TARGET_DIR)/usr/sbin
+	cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR) install
+	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+$(TARGET_DIR)/etc/inetd.conf: $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY)
+	mkdir -p $(TARGET_DIR)/etc
+	cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/
+	perl -i -p -e "s/^([a-z])/#\1/;" $(TARGET_DIR)/etc/inetd.conf
+
+netkitbase: uclibc $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) $(TARGET_DIR)/etc/inetd.conf
+
+netkitbase-clean:
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITBASE_DIR) uninstall
+	-rm -f $(TARGET_DIR)/usr/sbin/inetd $(TARGET_DIR)/etc/inetd.conf
+	-rm -f $(TARGET_DIR)/etc/inetd.conf
+	-$(MAKE) -C $(NETKITBASE_DIR) clean
+
+netkitbase-dirclean:
+	rm -rf $(NETKITBASE_DIR)
+
diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk
new file mode 100644
index 000000000..399aaa81f
--- /dev/null
+++ b/make/netkittelnet.mk
@@ -0,0 +1,73 @@
+#############################################################
+#
+# netkittelnet
+#
+#############################################################
+NETKITTELNET_SOURCE:=netkit-telnet-0.17.tar.gz
+NETKITTELNET_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
+NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-0.17
+NETKITTELNET_CAT:=bzcat
+NETKITTELNET_BINARY:=telnetd/telnetd
+NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd
+NETKITTELNET_PATCH:=$(SOURCE_DIR)/netkittelnet.patch
+
+$(DL_DIR)/$(NETKITTELNET_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE)
+
+netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE)
+
+$(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
+	$(NETKITTELNET_CAT) $(DL_DIR)/$(NETKITTELNET_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	# use ANSI syntax
+	perl -i -p -e "s/main\(\)/main(void)/;" $(NETKITTELNET_DIR)/configure
+	# Disable termcap support
+	perl -i -p -e "s~(.*termcap\.h.*)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
+	# don't try to run cross compiled binaries while configuring things
+	cat $(NETKITTELNET_PATCH) | patch -p1 -d $(NETKITTELNET_DIR)
+	touch $(NETKITTELNET_DIR)/.unpacked
+
+$(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked
+	(cd $(NETKITTELNET_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+		--installroot=$(TARGET_DIR) \
+		--with-c-compiler=$(TARGET_CC) \
+	);
+	touch  $(NETKITTELNET_DIR)/.configured
+
+$(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured
+	$(MAKE) SUB=telnetd CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR)
+	$(STRIP) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
+
+$(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY)
+	# Only install a few selected items...
+	mkdir -p $(TARGET_DIR)/usr/sbin
+	cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
+	# Enable telnet in inetd
+	perl -i -p -e "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR) install
+	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+netkittelnet: uclibc $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY)
+
+netkittelnet-clean:
+	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NETKITTELNET_DIR) uninstall
+	-rm -f $(TARGET_DIR)/usr/sbin/telnetd
+	-$(MAKE) -C $(NETKITTELNET_DIR) clean
+
+netkittelnet-dirclean:
+	rm -rf $(NETKITTELNET_DIR)
+
diff --git a/make/ntp.mk b/make/ntp.mk
new file mode 100644
index 000000000..f7bda2cc2
--- /dev/null
+++ b/make/ntp.mk
@@ -0,0 +1,61 @@
+#############################################################
+#
+# ntp
+#
+#############################################################
+NTP_SOURCE:=ntp-4.1.1.tar.gz
+NTP_SITE:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4
+NTP_DIR:=$(BUILD_DIR)/ntp-4.1.1
+NTP_CAT:=bzcat
+NTP_BINARY:=ntpdate/ntpdate
+NTP_TARGET_BINARY:=bin/ntpdate
+
+
+$(DL_DIR)/$(NTP_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(NTP_SITE)/$(NTP_SOURCE)
+
+ntp-source: $(DL_DIR)/$(NTP_SOURCE)
+
+$(NTP_DIR)/.unpacked: $(DL_DIR)/$(NTP_SOURCE)
+	$(NTP_CAT) $(DL_DIR)/$(NTP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	perl -i -p -e "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
+		$(NTP_DIR)/ntpd/refclock_pcf.c;
+	touch $(NTP_DIR)/.unpacked
+
+$(NTP_DIR)/.configured: $(NTP_DIR)/.unpacked
+	(cd $(NTP_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+		--with-shared \
+	);
+	touch  $(NTP_DIR)/.configured
+
+$(NTP_DIR)/$(NTP_BINARY): $(NTP_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(NTP_DIR)
+
+$(TARGET_DIR)/$(NTP_TARGET_BINARY): $(NTP_DIR)/$(NTP_BINARY)
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NTP_DIR) install
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+ntp: uclibc $(TARGET_DIR)/$(NTP_TARGET_BINARY)
+
+ntp-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(NTP_DIR) uninstall
+	-$(MAKE) -C $(NTP_DIR) clean
+
+ntp-dirclean:
+	rm -rf $(NTP_DIR)
+
diff --git a/make/pciutils.mk b/make/pciutils.mk
new file mode 100644
index 000000000..4d60ed8b3
--- /dev/null
+++ b/make/pciutils.mk
@@ -0,0 +1,69 @@
+#############################################################
+#
+# pciutils
+#
+#############################################################
+PCIUTILS_SOURCE:=pciutils-2.1.10.tar.gz
+PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+PCIUTILS_DIR:=$(BUILD_DIR)/pciutils-2.1.10
+PCIUTILS_CAT:=zcat
+
+# Yet more targets...
+PCIIDS_SITE:=http://pciids.sourceforge.net/
+PCIIDS_SOURCE:=pci.ids.bz2
+PCIIDS_CAT:=bzcat
+
+$(DL_DIR)/$(PCIUTILS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PCIUTILS_SITE)/$(PCIUTILS_SOURCE)
+
+$(DL_DIR)/$(PCIIDS_SOURCE):
+	$(WGET) -P $(DL_DIR) $(PCIIDS_SITE)/$(PCIIDS_SOURCE)
+
+pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
+
+$(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE)
+	$(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.id
+	touch $(PCIUTILS_DIR)/.unpacked
+
+$(PCIUTILS_DIR)/.configured: $(PCIUTILS_DIR)/.unpacked
+	(cd $(PCIUTILS_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+	);
+	touch  $(PCIUTILS_DIR)/.configured
+
+$(PCIUTILS_DIR)/lspci: $(PCIUTILS_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(PCIUTILS_DIR)
+
+$(TARGET_DIR)/sbin/lspci: $(PCIUTILS_DIR)/lspci
+	install -c $(PCIUTILS_DIR)/lspci $(TARGET_DIR)/sbin/lspci
+
+$(TARGET_DIR)/sbin/setpci: $(PCIUTILS_DIR)/setpci
+	install -c $(PCIUTILS_DIR)/setpci $(TARGET_DIR)/sbin/setpci
+
+$(TARGET_DIR)/usr/share/misc/pci.ids: $(PCIUTILS_DIR)/.dist
+	install -Dc $(PCIUTILS_DIR)/pci.ids $(TARGET_DIR)/usr/share/misc/pci.ids
+
+
+pciutils: uclibc $(TARGET_DIR)/sbin/setpci $(TARGET_DIR)/sbin/lspci $(TARGET_DIR)/usr/share/misc/pci.ids
+
+pciutils-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PCIUTILS_DIR) uninstall
+	-$(MAKE) -C $(PCIUTILS_DIR) clean
+
+pciutils-dirclean:
+	rm -rf $(PCIUTILS_DIR)
+
diff --git a/make/pcmcia.mk b/make/pcmcia.mk
new file mode 100644
index 000000000..88368a788
--- /dev/null
+++ b/make/pcmcia.mk
@@ -0,0 +1,92 @@
+#############################################################
+#
+# pcmcia card services
+#
+#############################################################
+# Copyright (C) 2001-2003 by Erik Andersen <andersen@codepoet.org>
+# Copyright (C) 2002 by Tim Riker <Tim@Rikers.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+PCMCIA_SOURCE:=pcmcia-cs-3.2.3.tar.gz
+PCMCIA_SITE:=http://telia.dl.sourceforge.net/sourceforge/pcmcia-cs
+PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.3
+PCMCIA_PATCH:=$(SOURCE_DIR)/pcmcia.patch
+PCMCIA_CAT:=zcat
+
+$(DL_DIR)/$(PCMCIA_SOURCE):
+	$(WGET) -P $(DL_DIR) $(PCMCIA_SITE)/$(PCMCIA_SOURCE)
+
+pcmcia-source: $(DL_DIR)/$(PCMCIA_SOURCE)
+
+$(PCMCIA_DIR)/.unpacked: $(DL_DIR)/$(PCMCIA_SOURCE)
+	$(PCMCIA_CAT) $(DL_DIR)/$(PCMCIA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(PCMCIA_DIR)/.unpacked
+
+$(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked
+	cat $(PCMCIA_PATCH) | patch -d $(PCMCIA_DIR) -p1
+	touch $(PCMCIA_DIR)/.patched
+
+$(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
+	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX_DIR) --noprompt \
+		--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
+		--sysv --kcc=$(HOSTCC) --ucc=$(TARGET_CC1) --ld=$(TARGET_CROSS)ld \
+		--target=$(TARGET_DIR))
+	touch $(PCMCIA_DIR)/.configured
+
+$(PCMCIA_DIR)/cardmgr/cardmgr: $(PCMCIA_DIR)/.configured
+	$(MAKE) -C $(PCMCIA_DIR) -i all
+	-A=`find $(PCMCIA_DIR) -type f -perm +111` ; \
+	for fo in $$A; do \
+		file $$fo | grep "ELF" | grep "executable" > /dev/null 2>&1; \
+		if [ $$? = 0 ] ; then \
+			$(STRIP) $$fo; \
+		fi; \
+	done
+	touch -c $(PCMCIA_DIR)/cardmgr/cardmgr
+
+$(TARGET_DIR)/sbin/cardmgr: $(PCMCIA_DIR)/cardmgr/cardmgr
+	rm -rf $(TARGET_DIR)/etc/pcmcia;
+	$(MAKE) -i -C $(PCMCIA_DIR) install
+	perl -i -p -e "s/pump/udhcpc/" $(TARGET_DIR)/etc/pcmcia/network
+	perl -i -p -e "s/ide_cs/ide-cs/" $(TARGET_DIR)/etc/pcmcia/config
+	perl -i -p -e "s/bind \"wvlan_cs\"/bind \"orinoco_cs\"/g" $(TARGET_DIR)/etc/pcmcia/config
+	perl -i -p -e "s,/var/lib/pcmcia/scheme,/etc/pcmcia/scheme," $(TARGET_DIR)/etc/pcmcia/shared
+	perl -i -p -e "s,/var/run/pcmcia-scheme,/etc/pcmcia/pcmcia-scheme," $(TARGET_DIR)/etc/pcmcia/shared
+	#perl -i -p -e "s/port 0x800-0x8ff, //" $(TARGET_DIR)/etc/pcmcia/config.opts ;
+	echo "default" > $(TARGET_DIR)/etc/pcmcia/scheme;
+	rm -rf $(TARGET_DIR)/usr/man;
+	rm -rf $(TARGET_DIR)/usr/share/man;
+	rm -rf $(TARGET_DIR)/usr/X11R6/man;
+	rm -rf $(TARGET_DIR)/etc/rc.d;
+	rm -rf $(TARGET_DIR)/etc/rc?.d;
+	rm -f $(TARGET_DIR)/etc/init.d/pcmcia.N;
+	rm -f $(TARGET_DIR)/sbin/dump_cis $(TARGET_DIR)/sbin/pack_cis
+	rm -f $(TARGET_DIR)/usr/share/pnp.ids $(TARGET_DIR)/sbin/lspnp $(TARGET_DIR)/sbin/setpnp;
+	rm -f $(TARGET_DIR)/sbin/pcinitrd
+	rm -f $(TARGET_DIR)/sbin/probe
+	cp $(SOURCE_DIR)/target_skeleton/etc/init.d/pcmcia $(TARGET_DIR)/etc/init.d/pcmcia
+	chmod -R u+w $(TARGET_DIR)/etc/pcmcia/*
+
+pcmcia: uclibc $(TARGET_DIR)/sbin/cardmgr
+
+pcmcia-clean:
+	rm -f $(TARGET_DIR)/sbin/cardmgr
+	-$(MAKE) -C $(PCMCIA_DIR) clean
+	rm -f $(PCMCIA_DIR)/.configured $(PCMCIA_DIR)/config.out
+
+pcmcia-dirclean:
+	rm -rf $(PCMCIA_DIR)
diff --git a/make/pppd.mk b/make/pppd.mk
new file mode 100644
index 000000000..89eba4501
--- /dev/null
+++ b/make/pppd.mk
@@ -0,0 +1,66 @@
+#############################################################
+#
+# pppd
+#
+#############################################################
+PPPD_SOURCE:=ppp-2.4.1b2.tar.gz
+PPPD_SITE:=ftp://ftp.samba.org/pub/ppp
+PPPD_DIR:=$(BUILD_DIR)/ppp-2.4.1b2
+PPPD_CAT:=zcat
+PPPD_BINARY:=pppd/pppd
+PPPD_TARGET_BINARY:=usr/sbin/pppd
+
+
+$(DL_DIR)/$(PPPD_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PPPD_SITE)/$(PPPD_SOURCE)
+
+pppd-source: $(DL_DIR)/$(PPPD_SOURCE)
+
+$(PPPD_DIR)/.unpacked: $(DL_DIR)/$(PPPD_SOURCE)
+	$(PPPD_CAT) $(DL_DIR)/$(PPPD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	perl -i -p -e 's/ -DIPX_CHANGE -DHAVE_MULTILINK -DHAVE_MMAP//' $(PPPD_DIR)/pppd/Makefile.linux
+	perl -i -p -e 's/$(INSTALL) -s/$(INSTALL)/' $(PPPD_DIR)/*/Makefile.linux
+	perl -i -p -e 's/ -o root//' $(PPPD_DIR)/*/Makefile.linux
+	perl -i -p -e 's/ -g daemon//' $(PPPD_DIR)/*/Makefile.linux
+	touch $(PPPD_DIR)/.unpacked
+
+$(PPPD_DIR)/.configured: $(PPPD_DIR)/.unpacked
+	(cd $(PPPD_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+	);
+	touch  $(PPPD_DIR)/.configured
+
+$(PPPD_DIR)/$(PPPD_BINARY): $(PPPD_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(PPPD_DIR)
+
+$(TARGET_DIR)/$(PPPD_TARGET_BINARY): $(PPPD_DIR)/$(PPPD_BINARY)
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PPPD_DIR) install
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+
+pppd: uclibc $(TARGET_DIR)/$(PPPD_TARGET_BINARY)
+
+pppd-clean:
+	rm -f  $(TARGET_DIR)/usr/sbin/pppd
+	rm -f  $(TARGET_DIR)/usr/sbin/chat
+	rm -rf $(TARGET_DIR)/etc/ppp
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(PPPD_DIR) uninstall
+	-$(MAKE) -C $(PPPD_DIR) clean
+
+pppd-dirclean:
+	rm -rf $(PPPD_DIR)
+
+
diff --git a/make/rxvt.mk b/make/rxvt.mk
new file mode 100644
index 000000000..3da4beeb2
--- /dev/null
+++ b/make/rxvt.mk
@@ -0,0 +1,68 @@
+#############################################################
+#
+# rxvt
+#
+#############################################################
+# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+RXVT_SOURCE:=rxvt-2.6.4.tar.bz2
+RXVT_PATCH:=$(SOURCE_DIR)/rxvt-2.6.4.patch
+RXVT_SITE:=ftp://ftp.rxvt.org/pub/rxvt/
+RXVT_CAT:=bzcat
+RXVT_DIR:=$(BUILD_DIR)/rxvt-2.6.4
+RXVT_BINARY:=$(RXVT_DIR)/src/rxvt
+
+$(DL_DIR)/$(RXVT_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(RXVT_SITE)/$(RXVT_SOURCE)
+
+rxvt-source: $(DL_DIR)/$(RXVT_SOURCE)
+
+$(RXVT_DIR)/.unpacked: $(DL_DIR)/$(RXVT_SOURCE)
+	$(RXVT_CAT) $(DL_DIR)/$(RXVT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(RXVT_DIR)/.unpacked
+
+$(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked
+	(cd $(RXVT_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr/X11R6 \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--x-includes=$(TINYX_DIR)/exports/include \
+		--x-libraries=$(TINYX_DIR)/exports/lib \
+	);
+	cat $(RXVT_PATCH) | patch -d $(RXVT_DIR) -p1
+	touch  $(RXVT_DIR)/.configured
+
+$(RXVT_BINARY): $(RXVT_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(RXVT_DIR)
+	$(STRIP) -x $(RXVT_BINARY)
+
+$(TARGET_DIR)/usr/X11R6/bin/rxvt: $(RXVT_BINARY)
+	cp -f $(RXVT_BINARY) $(TARGET_DIR)/usr/X11R6/bin
+
+rxvt: tinyx $(TARGET_DIR)/usr/X11R6/bin/rxvt
+
+rxvt-clean:
+	rm -f $(TARGET_DIR)/usr/X11R6/bin/rxvt
+	-$(MAKE) -C $(RXVT_DIR) clean
+
+rxvt-dirclean:
+	rm -rf $(RXVT_DIR)
+
diff --git a/make/sfdisk.mk b/make/sfdisk.mk
new file mode 100644
index 000000000..cd71dc693
--- /dev/null
+++ b/make/sfdisk.mk
@@ -0,0 +1,34 @@
+#############################################################
+#
+# sfdisk support
+#
+#############################################################
+SFDISK_SOURCE=sfdisk.tar.bz2
+SFDISK_SITE:=ftp://busybox.net/
+SFDISK_DIR=$(BUILD_DIR)/sfdisk
+
+
+$(DL_DIR)/$(SFDISK_SOURCE):
+	$(WGET) -P $(DL_DIR) $(SFDISK_SITE)/$(SFDISK_SOURCE)
+
+$(SFDISK_DIR): $(DL_DIR)/$(SFDISK_SOURCE)
+	bzcat $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+
+$(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)
+	$(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false -C $(SFDISK_DIR);
+	-$(STRIP) $(SFDISK_DIR)/sfdisk;
+	touch -c $(SFDISK_DIR)/sfdisk
+
+$(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk
+	cp $(SFDISK_DIR)/sfdisk $(TARGET_DIR)/sbin/sfdisk;
+	touch -c $(TARGET_DIR)/sbin/sfdisk
+
+sfdisk: uclibc $(TARGET_DIR)/sbin/sfdisk
+
+sfdisk-clean:
+	rm -f $(TARGET_DIR)/sbin/sfdisk
+	-$(MAKE) -C $(SFDISK_DIR) clean
+
+sfdisk-dirclean:
+	rm -rf $(SFDISK_DIR)
+
diff --git a/make/tinyx.mk b/make/tinyx.mk
new file mode 100644
index 000000000..372ce8487
--- /dev/null
+++ b/make/tinyx.mk
@@ -0,0 +1,125 @@
+#############################################################
+#
+# tinyx - a small footprint X-server for the TuxScreen
+#
+#############################################################
+# Copyright (C) 2002 by Tom Walsh <Tom@OpenHardware.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+#############################################################
+# You may want to change these.
+#############################################################
+
+TINYX_APPS:=xlsfonts/xlsfonts xmodmap/xmodmap
+#xset/xset xdpyinfo/xdpyinfo xsetroot/xsetroot \
+#	xrdb/xrdb xrandr/xrandr \
+#	xhost/xhost xauth/xauth oclock/oclock xeyes/xeyes
+#
+
+TINYX_LIBS:=ICE X11 Xext Xpm
+# Xaw SM Xt Xmu
+
+#############################################################
+# Stuff below this line shouldn't need changes.
+# if you do change, look in rxvt & matchbox for the impact!
+#############################################################
+#
+# Where resources are found.
+#
+TINYX_DIR:=$(BUILD_DIR)/xc-011010
+TINYX_LDIR:=$(TINYX_DIR)/lib
+TINYX_PROGS:=$(TINYX_DIR)/programs
+TINYX_PATCH:=$(SOURCE_DIR)/tinyx-011010.patch
+TINYX_SOURCE:=xc-011010.tar.bz2
+TINYX_SITE:= http://intimate.handhelds.org/jacques/
+TINYX_CF:=$(TINYX_DIR)/config/cf
+#
+# Some things that you may want to change.
+# 
+TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev
+TINYX_CAT:=bzcat
+TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/
+TINYX_LIBX:=$(TARGET_DIR)/usr/lib/
+
+#
+# These rules fetch various tinyx source files.
+#
+$(DL_DIR)/$(TINYX_SOURCE):
+	$(WGET) -P $(DL_DIR) $(TINYX_SITE)/$(TINYX_SOURCE)
+
+$(DL_DIR)/cross.def:
+	$(WGET) -P $(DL_DIR) $(TINYX_SITE)/xcompile/tuxscreen/cross.def 
+
+$(DL_DIR)/host.def:
+	$(WGET) -P $(DL_DIR) $(TINYX_SITE)/xcompile/tuxscreen/host.def 
+
+#
+# rule to make sure that we have the source, and it is configured.
+#
+$(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) $(DL_DIR)/cross.def $(DL_DIR)/host.def
+	$(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	cat $(TINYX_PATCH) | patch -d $(TINYX_DIR) -p1
+	cp $(DL_DIR)/host.def $(TINYX_CF)/host.def
+	cp $(DL_DIR)/cross.def $(TINYX_CF)/cross.def
+	perl -i -p -e 's:REPLACE_STAGING_DIR:$(STAGING_DIR):g' \
+			$(TINYX_CF)/cross.def \
+			$(TINYX_LDIR)/X11/Xlib.h
+	touch $(TINYX_DIR)/.configure
+
+#
+# Now that we have the source, build it...
+#
+$(TINYX_XFBDEV): $(TINYX_DIR)/.configure
+	rm -f $(TINYX_BINX)/Xfbdev
+	( cd $(TINYX_DIR) ; $(MAKE) World ; cd $(BUILDROOT) )
+
+#
+# Once Frame Buffer is built, we install executables.
+#
+$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
+	-mkdir $(TARGET_DIR)/usr/X11R6
+	-mkdir $(TINYX_BINX)
+	for file in $(TINYX_APPS) ; do \
+		cp -f $(TINYX_DIR)/programs/$$file $(TINYX_BINX) ; \
+		$(STRIP) $(TINYX_PROGS)/$$file ; \
+	done
+	cp $(TINYX_DIR)/programs/Xserver/Xfbdev $(TINYX_BINX)
+	$(STRIP) $(TINYX_BINX)/Xfbdev
+	cp -f $(TINYX_DIR)/startx $(TARGET_DIR)/bin
+	chmod a+x $(TARGET_DIR)/bin/startx
+
+#
+# After we have executables installed, install the libraries.
+#
+$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
+	for dirs in $(TINYX_LIBS) ; do \
+		file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
+		$(STRIP) --strip-unneeded $$file ; \
+		cp -f $$file $(TINYX_LIBX) ; \
+		file=`find $(TINYX_LDIR)/$$dirs -type l -iname "lib$$dirs.so*"` ; \
+		cp -pRf $$file $(TINYX_LIBX) ; \
+	done
+
+tinyx: zlib $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
+
+tinyx-clean:
+	-rm -rf $(TARGET_DIR)/usr/X11R6
+	-$(MAKE) -C $(TINYX_DIR) clean
+
+tinyx-dirclean:
+	-rm -rf $(TINYX_DIR)
+	-rm -rf $(TARGET_DIR)/usr/X11R6
diff --git a/make/tn5250.mk b/make/tn5250.mk
new file mode 100644
index 000000000..b02ded7e2
--- /dev/null
+++ b/make/tn5250.mk
@@ -0,0 +1,47 @@
+TN5250_SITE:=http://telia.dl.sourceforge.net/sourceforge/tn5250
+TN5250_DIR:=$(BUILD_DIR)/tn5250-0.16.4
+TN5250_SOURCE:=tn5250-0.16.4.tar.gz
+
+$(DL_DIR)/$(TN5250_SOURCE):
+	$(WGET) -P $(DL_DIR) $(TN5250_SITE)/$(TN5250_SOURCE) 
+
+$(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE)
+	gunzip -c $(DL_DIR)/$(TN5250_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	-touch $(TN5250_DIR)/.dist
+
+$(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist
+	(cd $(TN5250_DIR); rm -rf config.cache; \
+		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-nls \
+		--with-slang --without-x --without-ssl \
+	);
+	touch  $(TN5250_DIR)/.configured
+
+$(TN5250_DIR)/tn5250: $(TN5250_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC1) -C $(TN5250_DIR)
+
+$(TARGET_DIR)/usr/bin/tn5250: $(TN5250_DIR)/tn5250
+	install -c $(TN5250_DIR)/tn5250 $(TARGET_DIR)/usr/bin/tn5250
+
+tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250
+
+tn5250-clean: 
+	$(MAKE) -C $(TN5250_DIR) clean
+
+tn5250-dirclean: 
+	rm -rf $(TN5250_DIR) 
+
+
+
diff --git a/sources/netkittelnet.patch b/sources/netkittelnet.patch
new file mode 100644
index 000000000..00fe03fd4
--- /dev/null
+++ b/sources/netkittelnet.patch
@@ -0,0 +1,117 @@
+--- netkit-telnet-0.17/configure	Thu Apr 11 10:40:58 2002
++++ FIXEDnetkittelnet/configure	Thu Apr 11 10:39:59 2002
+@@ -78,7 +78,6 @@
+     for TRY in egcs gcc g++ CC c++ cc; do
+        (
+            $TRY __conftest.c -o __conftest || exit 1;
+-           ./__conftest || exit 1;
+        ) >/dev/null 2>&1 || continue;
+        CC=$TRY
+        break;
+@@ -94,7 +93,6 @@
+     echo -n 'Checking if C compiler works... '
+     if (
+           $CC __conftest.c -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -125,7 +123,6 @@
+     for TRY in egcs gcc g++ CC c++ cc; do
+        (
+            $TRY __conftest.cc -o __conftest || exit 1;
+-           ./__conftest || exit 1;
+        ) >/dev/null 2>&1 || continue;
+        CXX=$TRY
+        break;
+@@ -141,7 +138,6 @@
+     echo -n 'Checking if C++ compiler works... '
+     if (
+           $CXX __conftest.cc -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -278,13 +274,11 @@
+ EOF
+ if (
+       $CXX $CXXFLAGS  __conftest.cc  -o __conftest || exit 1
+-      ./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'yes'
+ else
+     if (
+           $CXX $CXXFLAGS -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+@@ -292,6 +286,7 @@
+     else
+         echo 'no'
+         echo 'This package needs BSD signal semantics to run.'
++		echo "$CXX $CXXFLAGS  -D__USE_BSD_SIGNAL __conftest.cc  -o __conftest failed"
+         rm -f __conftest*
+         exit
+     fi
+@@ -330,31 +325,6 @@
+         echo 'no'
+     fi
+ fi
+-
+-if [ x$NCURSES != x ]; then
+-    LIBTERMCAP=-lncurses
+-else
+-    echo -n 'Checking for traditional termcap... '
+-cat <<EOF >__conftest.cc
+-#include <stdio.h>
+-#include <termcap.h>
+-int main(void) {
+-    tgetent(NULL, NULL); return 0;
+-}
+-
+-EOF
+-    if (
+-          $CXX $CXXFLAGS  __conftest.cc -ltermcap -o __conftest || exit 1
+-       ) >/dev/null 2>&1; then
+-        echo '-ltermcap'
+-        LIBTERMCAP=-ltermcap
+-    else
+-        echo 'not found'
+-        echo 'This package needs termcap to run.'
+-        rm -f __conftest*
+-        exit
+-    fi
+-fi
+ rm -f __conftest*
+ 
+ ##################################################
+@@ -468,7 +438,6 @@
+ else
+     if (
+           $CXX $CXXFLAGS -D_GNU_SOURCE __conftest.cc  -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D_GNU_SOURCE'
+         CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -501,20 +470,17 @@
+ EOF
+ if (
+       $CXX $CXXFLAGS  __conftest.cc $LIBBSD -o __conftest || exit 1
+-      ./__conftest || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'ok'
+ else
+     if (
+           $CXX $CXXFLAGS  __conftest.cc -lsnprintf $LIBBSD -o __conftest || exit 1
+-          ./__conftest || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-lsnprintf'
+         LIBS="$LIBS -lsnprintf"
+     else
+         if (
+               $CXX $CXXFLAGS  __conftest.cc -ldb $LIBBSD -o __conftest || exit 1
+-              ./__conftest || exit 1
+            ) >/dev/null 2>&1; then
+             echo '-ldb'
+             LIBS="$LIBS -ldb"
diff --git a/sources/pcmcia.patch b/sources/pcmcia.patch
new file mode 100644
index 000000000..42a16175d
--- /dev/null
+++ b/sources/pcmcia.patch
@@ -0,0 +1,54 @@
+diff -urN pcmcia-cs-3.1.33.orig/etc/shared pcmcia-cs-3.1.33/etc/shared
+--- pcmcia-cs-3.1.33.orig/etc/shared	Thu Nov 22 11:25:24 2001
++++ pcmcia-cs-3.1.33/etc/shared	Mon Apr 15 00:39:47 2002
+@@ -2,6 +2,8 @@
+ # shared 1.28 2001/08/23 00:43:17 (David Hinds)
+ #
+ 
++umask 022
++
+ usage ()
+ {
+     echo "usage: $0 [action] [device name]"
+--- pcmcia-cs-3.1.34/etc/config.opts.orig	Tue Jul  9 09:36:23 2002
++++ pcmcia-cs-3.1.34/etc/config.opts	Tue Jul  9 09:37:47 2002
+@@ -5,7 +5,7 @@
+ 
+ # System resources available for PCMCIA devices
+ 
+-include port 0x100-0x4ff, port 0x800-0x8ff, port 0xc00-0xcff
++include port 0x100-0x4ff, port 0xc00-0xcff
+ include memory 0xc0000-0xfffff
+ include memory 0xa0000000-0xa0ffffff, memory 0x60000000-0x60ffffff
+ 
+@@ -22,7 +22,7 @@
+ # Second built-in serial port
+ #exclude irq 3
+ # First built-in parallel port
+-exclude irq 7
++#exclude irq 7
+ 
+ #----------------------------------------------------------------------
+ 
+@@ -36,7 +36,7 @@
+ 
+ # Options for Raylink/WebGear driver: uncomment only one line...
+ # Generic ad-hoc network
+-module "ray_cs" opts "essid=ADHOC_ESSID hop_dwell=128 beacon_period=256 translate=1"
++#module "ray_cs" opts "essid=ADHOC_ESSID hop_dwell=128 beacon_period=256 translate=1"
+ # Infrastructure network for older cards
+ #module "ray_cs" opts "net_type=1 essid=ESSID1"
+ # Infrastructure network for WebGear
+--- pcmcia-cs-3.2.1/Configure.orig	Thu Aug  8 00:38:15 2002
++++ pcmcia-cs-3.2.1/Configure	Tue Sep 10 05:41:24 2002
+@@ -669,6 +669,10 @@
+      >/dev/null 2>&1 ; then
+     CONFIG_IEEE1394=n
+ fi
++
++# Hack to disable network stuff for the time being...
++CONFIG_INET=n
++
+ printconfig
+ echo ""
+ 
diff --git a/sources/tinyx-011010.patch b/sources/tinyx-011010.patch
new file mode 100644
index 000000000..3040b3dd4
--- /dev/null
+++ b/sources/tinyx-011010.patch
@@ -0,0 +1,173 @@
+diff -Nur --exclude=CVS xc-011010.src/include/extensions/lbxstr.h xc-011010/include/extensions/lbxstr.h
+--- xc-011010.src/include/extensions/lbxstr.h	Tue Jul 31 20:44:35 2001
++++ xc-011010/include/extensions/lbxstr.h	Sun Apr 21 12:35:05 2002
+@@ -25,7 +25,7 @@
+ #ifndef _LBXSTR_H_
+ #define _LBXSTR_H_
+ 
+-#include <X11/extensions/XLbx.h>
++#include "XLbx.h"
+ 
+ #define LBXNAME "LBX"
+ 
+diff -Nur --exclude=CVS xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h
+--- xc-011010.src/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Jun  3 17:52:45 2001
++++ xc-011010/programs/Xserver/hw/kdrive/fbdev/fbdev.h	Sun Apr 21 12:36:25 2002
+@@ -29,6 +29,7 @@
+ #include <linux/fb.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
++#include <sys/types.h>
+ #include "kdrive.h"
+ #include "layer.h"
+
+diff -Nur xc-011010.src2/lib/X11/Xlib.h xc-011010/lib/X11/Xlib.h
+--- xc-011010.src/programs/Xserver/hw/kdrive/linux/ts.c	Tue Jul 10 22:58:19 2001
++++ xc-011010/programs/Xserver/hw/kdrive/linux/ts.c	Tue Apr 23 20:16:23 2002
+@@ -33,65 +33,48 @@
+ #include "kdrive.h"
+ #include "Xpoll.h"
+ #include <sys/ioctl.h>
+-#include <linux/h3600_ts.h>	/* touch screen events */
++
++typedef struct {
++  unsigned short          pressure;
++  unsigned short          x;
++  unsigned short          y;
++  unsigned short          pad;
++  struct timeval  stamp;
++} TS_EVENT;
+ 
+ static long lastx = 0, lasty = 0;
+ int TsScreen;
+ extern int TsFbdev;
+ 
+-void
+-TsRead (int tsPort, void *closure)
+-{
+-    TS_EVENT	    event;
+-    long	    buf[3];
+-    int		    n;
+-    long	    pressure;
+-    long	    x, y;
+-    unsigned long   flags;
+-    unsigned long   buttons;
+-
+-    n = Ps2ReadBytes (tsPort, (char *) &event, 
+-			 sizeof (event), sizeof (event));
+-    if (n == sizeof (event))  
+-    {
+-	if (event.pressure) 
+-	{
+-	    /* 
+-	     * HACK ATTACK.  (static global variables used !)
+-	     * Here we test for the touch screen driver actually being on the
+-	     * touch screen, if it is we send absolute coordinates. If not,
+-	     * then we send delta's so that we can track the entire vga screen.
+-	     */
+-	    if (TsScreen == TsFbdev) {
+-	    	flags = KD_BUTTON_1;
+-	    	x = event.x;
+-	    	y = event.y;
+-	    } else {
+-	    	flags = /* KD_BUTTON_1 |*/ KD_MOUSE_DELTA;
+-	    	if ((lastx == 0) || (lasty == 0)) {
+-	    	    x = 0;
+-	    	    y = 0;
+-	    	} else {
+-	    	    x = event.x - lastx;
+-	    	    y = event.y - lasty;
+-	    	}
+-	    	lastx = event.x;
+-	    	lasty = event.y;
+-	    }
+-	} else {
+-	    flags = KD_MOUSE_DELTA;
+-	    x = 0;
+-	    y = 0;
+-	    lastx = 0;
+-	    lasty = 0;
+-	}
+-	KdEnqueueMouseEvent (flags, x, y);
++void TsRead (int tsPort, void *closure) {
++  TS_EVENT        event;
++  long            buf[3];
++  int             n;
++  long            pressure;
++  long            x, y;
++  unsigned long   flags;
++  unsigned long   buttons;
++
++  n = Ps2ReadBytes(tsPort, (char *) &event, sizeof (event), sizeof (event));
++  if (n >= sizeof (event)) {
++    if (event.pressure >= 100) {
++      flags = KD_BUTTON_1;
++      x = (960 - event.x) * 640 / (920);
++      y = (960 - event.y) * 480 / (920);
++      //ErrorF("flags %d x %d y %dn",flags,event.x,event.y);
++    }
++    else {
++      flags = KD_MOUSE_DELTA;
++      x = lastx;
++      y = lasty;
+     }
++    KdEnqueueMouseEvent(flags, x, y);
++  }
+ }
+ 
+ char	*TsNames[] = {
+-  "/dev/ts",	
+-  "/dev/h3600_ts" /* temporary name; note this code can try
++  "/dev/ucb1x00-ts",
++  "/dev/ts" /* temporary name; note this code can try
+ 			   to open more than one device */
+ };
+ 
+@@ -99,9 +82,7 @@
+ 
+ int TsInputType;
+ 
+-int
+-TsInit (void)
+-{
++int TsInit (void) {
+     int	    i;
+     int	    TsPort;
+ 
+diff -Nur xc-011010.src/startx xc-011010/startx
+--- ../../buildroot-tux.Apr25-1/build/xc-011010.src/startx	Thu Apr 25 05:20:35 2002
++++ xc-011010/startx	Sun Apr 28 05:35:35 2002
+@@ -0,0 +1,11 @@
++#!/bin/sh
++killall Xfbdev
++sleep 1
++export DISPLAY=":0"
++/usr/X11R6/bin/Xfbdev -ac &
++sleep 4
++/usr/X11R6/bin/matchbox &
++sleep 1
++/usr/X11R6/bin/minisys &
++/usr/X11R6/bin/minitime &
++/usr/X11R6/bin/rxvt &
+diff -Nur xc-011010.src/lib/Xft/xftgram.y xc-011010/lib/Xft/xftgram.y
+--- ../../buildroot-tux.Apr25-1/build/xc-011010/lib/Xft/xftgram.y	Thu Apr 25 05:20:35 2002
++++ xc-011010/lib/Xft/xftgram.y	Sun Apr 28 05:35:35 2002
+@@ -165,6 +165,7 @@
+ 		    matrix.yx = $4;
+ 		    matrix.__REALLY_YY__ = $5;
+ 		}
++	;
+ number	:   INTEGER
+ 		{ $$ = (double) $1; }
+ 	|   DOUBLE
+diff -Nur xc-011010.src/programs/twm/gram.y xc-011010/programs/twm/gram.y
+--- ../../buildroot-tux.Apr25-1/build/xc-011010/programs/twm/gram.y	Thu Apr 25 05:20:35 2002
++++ xc-011010/programs/twm/gram.y	Sun Apr 28 05:35:35 2002
+@@ -650,6 +650,7 @@
+ 					  RemoveDQuote(ptr);
+ 					  $$ = ptr;
+ 					}
++		;
+ number		: NUMBER		{ $$ = $1; }
+ 		;
+