diff --git a/README b/README
index 6225d4bce..82bed2cb2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This Git repository will host a few PKGBUILDs and information
+This git repository will host a few PKGBUILDs and information
 on porting Arch Linux (http://archlinux.org) to the
 Marvell Sheevaplug platform (ARM-based).
 
diff --git a/core/kernel-headers/PKGBUILD b/core/kernel-headers/PKGBUILD
index 8127e6177..095cfbc8b 100644
--- a/core/kernel-headers/PKGBUILD
+++ b/core/kernel-headers/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Mike Staszel <mikestaszel@plugapps.com>
 
 pkgname=kernel-headers
-pkgver=2.6.32.7
-pkgrel=2
+pkgver=2.6.32.9
+pkgrel=1
 pkgdesc="The Linux kernel headers for SheevaPlug and TonidoPlug"
 arch=('arm')
 license=('GPL2')
 url="http://sheeva.with-linux.com/sheeva/"
 depends=('coreutils' 'module-init-tools')
 source=(http://sheeva.with-linux.com/sheeva/$pkgver/sheeva-$pkgver-KernelHeaders.tar.gz)
-md5sums=('622c9bfc4f5e88a4183da52bffa0cf6f')
+md5sums=('8336cd23e6d967d1f99ff3074d8df001')
 
 build() {
   cp -R $startdir/src/usr $startdir/pkg/
diff --git a/core/kernel26-withlinux/PKGBUILD b/core/kernel26-withlinux/PKGBUILD
index 4bda23f1b..305881c85 100644
--- a/core/kernel26-withlinux/PKGBUILD
+++ b/core/kernel26-withlinux/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Mike Staszel <mikestaszel@gmail.com>
 
 pkgname=kernel26-withlinux
-pkgver=2.6.32.7
-pkgrel=2
+pkgver=2.6.32.9
+pkgrel=1
 pkgdesc="The Linux Kernel and modules"
 arch=('arm')
 license=('GPL2')
@@ -13,7 +13,7 @@ conflicts=('kernel26')
 provides=('kernel26')
 install=kernel26-withlinux.install
 source=(http://sheeva.with-linux.com/sheeva/README-$pkgver)
-md5sums=('866d09341839da3ba840fa53313f44c0')
+md5sums=('8c74f21a16b93cef2b159ce8119654b2')
 
 build() {
   cd ${srcdir}/
diff --git a/core/kernel26-withlinux/kernel26-withlinux.install b/core/kernel26-withlinux/kernel26-withlinux.install
index 2cefe0b32..fd6ea6ddb 100644
--- a/core/kernel26-withlinux/kernel26-withlinux.install
+++ b/core/kernel26-withlinux/kernel26-withlinux.install
@@ -5,7 +5,7 @@ post_install() {
 	If running from internal NAND, run:
 	/usr/share/plugapps/kernel/README-2.6.32.7 --nandkernel
 	 
-	If running from SD/MMC, run:
+	If running from SD/MMC or on a TonidoPlug, run:
 	/usr/share/plugapps/kernel/README-2.6.32.7 --rootkernel
 	and then copy the kernel to /boot/uImage.
 	 
diff --git a/core/yaourt/PKGBUILD b/core/yaourt/PKGBUILD
deleted file mode 100644
index d027b789d..000000000
--- a/core/yaourt/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Author: Julien MISCHKOWITZ <wain@archlinux.fr>
-
-pkgname=yaourt
-pkgver=0.9.2.6
-pkgrel=1
-pkgdesc="A Pacman frontend with more features and AUR support" 
-arch=(i686 x86_64 ppc arm)
-url="http://www.archlinux.fr/yaourt-en/" 
-license="GPL" 
-depends=('wget' 'diffutils' 'pacman>=3.2.0') 
-makedepends=('gettext')
-optdepends=('aurvote: vote for favorite packages from AUR for inclusion in [community]'
-        'customizepkg: automatically modify PKGUILD during install/upgrade'
-        'pacman-color: fully colorized output'
-        'colordiff: colorized output with yaourt -C')
-install=yaourt.install
-backup=('etc/yaourtrc')
-source=(http://archiwain.free.fr/os/i686/$pkgname/$pkgname-$pkgver.src.tar.gz)
-md5sums=('188fecb7c7401287cca6028ab3f2de6f')
-
-build() { 
-	cd $startdir/src/$pkgname-$pkgver 
-	make install DESTDIR=$pkgdir || return 1
-}
diff --git a/core/yaourt/yaourt.install b/core/yaourt/yaourt.install
deleted file mode 100644
index 9bd680a80..000000000
--- a/core/yaourt/yaourt.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	cat <<-EndOfMessage
-	==> to use yaourt as user,add these entries to /etc/sudoers:
-           user ALL=NOPASSWD: /usr/bin/pacman
-           user ALL=NOPASSWD: /usr/bin/pacdiffviewer
-	(Please, use sudo very carefully)
-	==> for a full colorized output, install pacman-color and set PacmanBin in /etc/yaourtrc
-	EndOfMessage
-	/bin/true
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
new file mode 100644
index 000000000..9b21cd257
--- /dev/null
+++ b/core/zlib/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Mike Staszel <mikestaszel@plugapps.com>
+
+pkgname=zlib
+pkgver=1.2.3.9
+pkgrel=1
+pkgdesc="A compression/decompression Library"
+arch=(arm)
+license=('custom:zlib')
+url="http://www.zlib.net/"
+groups=('base')
+depends=('glibc')
+source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz")
+md5sums=('e63390cc6cbd0722f70729307d4dd01d')
+
+build() {
+	cd ${srcdir}/zlib-$pkgver
+
+	./configure --prefix=/usr --shared
+	make || return 1
+	make install prefix=${pkgdir}/usr || return 1
+	chmod 644 ${pkgdir}/usr/lib/libz.a
+
+	grep -A 24 '^  Copyright' zlib.h > license.txt
+	install -Dm644 license.txt ${pkgdir}/usr/share/licenses/zlib/license.txt
+}