diff --git a/sys-kernel/geos_one-sources/ChangeLog b/sys-kernel/geos_one-sources/ChangeLog
index 330419ae..5c2cb9c7 100644
--- a/sys-kernel/geos_one-sources/ChangeLog
+++ b/sys-kernel/geos_one-sources/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*geos_one-sources-2.6.30-r5 (01 Sep 2009)
+*geos_one-sources-2.6.30-r4 (01 Sep 2009)
+
+  01 Sep 2009; Mario Fetka <mario.fetka@gmail.com>
+  +geos_one-sources-2.6.30-r4.ebuild, +geos_one-sources-2.6.30-r5.ebuild:
+  Bump gentoo patches
+
 *geos_one-sources-2.6.30-r3 (04 Aug 2009)
 
   04 Aug 2009; Mario Fetka <mario.fetka@gmail.com>
diff --git a/sys-kernel/geos_one-sources/Manifest b/sys-kernel/geos_one-sources/Manifest
index 1654a881..16b2da50 100644
--- a/sys-kernel/geos_one-sources/Manifest
+++ b/sys-kernel/geos_one-sources/Manifest
@@ -38,5 +38,5 @@ 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 8823 RMD160 a366da806e0bf1c9c40b6465f29aa996c2537dbd SHA1 e2034e9f84de7dd3a6a46c06dc75a0fcb3f9d100 SHA256 3915108f6ba8187a3231641679c64b6dd5efca4a2e48129cc4ce4a9bc4c3f32d
+MISC ChangeLog 9056 RMD160 99ced4fd6a7d6745906864186884f895e5674409 SHA1 06b3d8feee60ed5d90f56a19259fca60d30be382 SHA256 64be19010be901767e9ff60bf79e70da9b4bd99f88412ab097cc22ac1818769c
 MISC metadata.xml 413 RMD160 7e4e48d47e48804072f4ce93e1948fda82433a90 SHA1 cd61cf36ba79f6635ab7b7957f31609ecf52cc90 SHA256 74fe6520890eaf800a1759f3e4f772fd0e433e5de9cf775a50c7af95b199518b
diff --git a/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r4.ebuild b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r4.ebuild
new file mode 100644
index 00000000..4de2f6ca
--- /dev/null
+++ b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r4.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="5"
+
+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."
+}
diff --git a/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r5.ebuild b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r5.ebuild
new file mode 100644
index 00000000..a9a380d2
--- /dev/null
+++ b/sys-kernel/geos_one-sources/geos_one-sources-2.6.30-r5.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="6"
+
+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."
+}