diff --git a/sys-kernel/geos_one-sources/ChangeLog b/sys-kernel/geos_one-sources/ChangeLog
index 5c2cb9c7..b9640ea2 100644
--- a/sys-kernel/geos_one-sources/ChangeLog
+++ b/sys-kernel/geos_one-sources/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*geos_one-sources-2.6.30-r6 (04 Sep 2009)
+
+  04 Sep 2009; Mario Fetka <mario.fetka@gmail.com>
+  +geos_one-sources-2.6.30-r6.ebuild:
+  bump genpatches
+
 *geos_one-sources-2.6.30-r5 (01 Sep 2009)
 *geos_one-sources-2.6.30-r4 (01 Sep 2009)
 
diff --git a/sys-kernel/geos_one-sources/Manifest b/sys-kernel/geos_one-sources/Manifest
index 16b2da50..cffc02ab 100644
--- a/sys-kernel/geos_one-sources/Manifest
+++ b/sys-kernel/geos_one-sources/Manifest
@@ -19,6 +19,8 @@ DIST genpatches-2.6.30-5.base.tar.bz2 52369 RMD160 ee502b57af64aad0e7e98e9ed474e
 DIST genpatches-2.6.30-5.extras.tar.bz2 24671 RMD160 e8cadff5be621233e664a3e35b5210818cc4d083 SHA1 886172bdaa420b1ecf54d8e57f3c36bb2e07eb2a SHA256 7b71b08797f6e3e05b662b98f8f7a80da7cb708070ff50eed9d01fe7c2e42a3f
 DIST genpatches-2.6.30-6.base.tar.bz2 75248 RMD160 7eaea6cdc1aa283ad7926e2370ccc807b2e8778f SHA1 f14ead72994d35b4e417d294ff55f16c51cd18cb SHA256 e43d166b73a219f35936a13981b8ad22a99eb20112daacab2fb782ab3af92216
 DIST genpatches-2.6.30-6.extras.tar.bz2 24978 RMD160 95e44fd010bf659a59087b91d95c7982e6877b3e SHA1 de8e4cc7fac2f445ac077928b868c4474c7a3012 SHA256 faaad5a9cf5c92d6d97843aed4cee8c20d431e9542628410cb0c75b7ea51bc88
+DIST genpatches-2.6.30-7.base.tar.bz2 94892 RMD160 eab263b79c7b21453097b2e57345be960811f99e SHA1 191db00b82c88b7eecf5bb6f29ab96e2ec90faab SHA256 10148bbe4b64970a6faa1d0a6ca6f478d7eeadb18f2338a3c0d797ced9401318
+DIST genpatches-2.6.30-7.extras.tar.bz2 24950 RMD160 eb954020a4653cc90018649d6fc28f6c0747ed50 SHA1 978a81f37201c1c4b752d7ac4501255d1361a4c9 SHA256 f5fbc360b18e48bcb85efcb90e5b22a83d368d4693e07d16745fd330b22b5276
 DIST geos_one-patches-2.6.29-1-p1.tar.bz2 637622 RMD160 b5247372c35226f0c2c83f53db0aafea7947fb24 SHA1 d7a72224da930e5073e1a2381fe4e1c8a1f7a0ba SHA256 e9e79cf1d49f87cee56f627d8570f2fd025b07a98139dae25470197ad2927b6b
 DIST geos_one-patches-2.6.29-4-p1.tar.bz2 1064932 RMD160 220e3b83b0b6d0b7397b1323415bf29badd453b6 SHA1 83d5eb4285980c90305fa386c7f7393c29718958 SHA256 e44690a745c6e4b24a1cde7832b45e9cc805ff06d9f546fcd99ec1d362626a28
 DIST geos_one-patches-2.6.29-6-p4.tar.bz2 1087539 RMD160 1e141e1d06741f8028dd1f11762203b67309fc75 SHA1 9f5b8bd55d0688e53bdcacfefdc0bc6575a60980 SHA256 fa2e72a48d8656dc11911f640b7fb60c1d3d6f207d0e42c632a5e2679632b0ab
@@ -38,5 +40,6 @@ EBUILD geos_one-sources-2.6.30-r2.ebuild 1494 RMD160 20776d249a785aa2a3b97060cd4
 EBUILD geos_one-sources-2.6.30-r3.ebuild 1494 RMD160 ac49263a29544d7a0a968a12ee3fca65d8b4cd4b SHA1 c46a230e9a9edae329d21ab6fcbe4ab419ac4d91 SHA256 397085191cceba3a5a57e565a7294dc77a2aa9d18dbe6c1633dfdfc06ea24f08
 EBUILD geos_one-sources-2.6.30-r4.ebuild 1494 RMD160 c8519014ef0205d78f8b7f91de9c9818b59eceab SHA1 aa74c9dabecb9e40a19bc3e9cf2237278f9cdfb7 SHA256 1eb294c74e85976a6629fe12ea673ff7a4a75bb1266954c1cb9440a76626e792
 EBUILD geos_one-sources-2.6.30-r5.ebuild 1494 RMD160 0363f2b8c770bd1a278810a905de8765fdd24606 SHA1 3e85fb14b8d2b52791acfa847bbf3a428e52001e SHA256 87c8735223ceebd62fa57a6662afb7c26bf4ec208ca98a2ec23785adea8c9bdc
-MISC ChangeLog 9056 RMD160 99ced4fd6a7d6745906864186884f895e5674409 SHA1 06b3d8feee60ed5d90f56a19259fca60d30be382 SHA256 64be19010be901767e9ff60bf79e70da9b4bd99f88412ab097cc22ac1818769c
+EBUILD geos_one-sources-2.6.30-r6.ebuild 1494 RMD160 6e91cd8f2666617258afdf0dd2bf6242607dd8df SHA1 184cd91a13e8b29fc2950f2540ae2fa0f2046425 SHA256 ab147c6dad1c71f4afcd19a006c39fefe5b29754aa2e45db0e033b58765e19ca
+MISC ChangeLog 9207 RMD160 3ba76daa08c08add77c538a51c6a3f9b9eeca28b SHA1 cd525747917731d8e44602b67c027807921aeefe SHA256 6fb8d4a7f423b8565a469eb4824d4838386da77250d44acfbe69923aa7655f53
 MISC metadata.xml 413 RMD160 7e4e48d47e48804072f4ce93e1948fda82433a90 SHA1 cd61cf36ba79f6635ab7b7957f31609ecf52cc90 SHA256 74fe6520890eaf800a1759f3e4f772fd0e433e5de9cf775a50c7af95b199518b
diff --git a/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r6.ebuild b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r6.ebuild
new file mode 100644
index 00000000..84c667b5
--- /dev/null
+++ b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+
+AAPATCHES_VER="2.3-p1"
+AAPATCHES="apparmor-patches-${PV}-${AAPATCHES_VER}.tar.bz2"
+AAPATCHES_URI="http://ftp.mars.arge.at/apparmor/${AAPATCHES}"
+
+GOPATCHES_VER="3-p1"
+GOPATCHES="geos_one-patches-${PV}-${GOPATCHES_VER}.tar.bz2"
+GOPATCHES_URI="http://ftp.mars.arge.at/go/${GOPATCHES}"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches http://forge.novell.com/modules/xfmod/project/?apparmor"
+
+DESCRIPTION="Full sources including the Gentoo & AppArmor patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${GOPATCHES_URI} ${AAPATCHES_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${GOPATCHES} ${DISTDIR}/${AAPATCHES} "
+#UNIPATCH_EXCLUDE="6012_UnionFS_2.5.1-1-AppArmor_2.3.patch 6013_fix-unionfs-for-2.6.28.1.patch"
+
+src_unpack() {
+	kernel-2_src_unpack
+
+	find "${WORKDIR}" -iname "*.orig" -exec rm {} \; 2> /dev/null
+
+}
+
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	einfo
+	einfo "Make sure that your kernel configuration file is set with:"
+	einfo " CONFIG_SECURITY=y"
+	einfo "         CONFIG_SECURITY_APPARMOR=y"
+	einfo "Without these, apparmor will not function."
+}