diff --git a/base/uclibc/parse-config-9 b/base/uclibc/parse-config-9
index f7be44758..5d2b64c61 100644
--- a/base/uclibc/parse-config-9
+++ b/base/uclibc/parse-config-9
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../uclibc/parse-config-9
-# Copyright (C) 2006 - 2008 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -187,7 +187,7 @@ if [ "$SDECFG_LIBC" == "uclibc" ]; then
 			pkg_uclibc_pkg=${pkg//-/_} ;;
 	esac
 
-	pkg_uclubc_patches=$( ls -1 $pkg_uclibc_dir/pkg_patch/$pkg_uclibc_pkg-*.patch 2> /dev/null | tr '\n' ' ' )
+	pkg_uclubc_patches=$( ls -1 $pkg_uclibc_dir/pkg_patch/$pkg_uclibc_pkg/*.patch 2> /dev/null | tr '\n' ' ' )
 	if [ -n "$pkg_uclubc_patches" ]; then
 		echo_status "uClibc: appending patches ..."
 		var_append patchfiles ' ' "$pkg_uclubc_patches"
diff --git a/base/uclibc/pkg_patch/acl-uclibc.patch b/base/uclibc/pkg_patch/acl/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/acl-uclibc.patch
rename to base/uclibc/pkg_patch/acl/uclibc.patch
diff --git a/base/uclibc/pkg_patch/alsa_utils-uclibc.patch b/base/uclibc/pkg_patch/alsa_utils/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/alsa_utils-uclibc.patch
rename to base/uclibc/pkg_patch/alsa_utils/uclibc.patch
diff --git a/base/uclibc/pkg_patch/ash-uclibc.patch b/base/uclibc/pkg_patch/ash/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/ash-uclibc.patch
rename to base/uclibc/pkg_patch/ash/uclibc.patch
diff --git a/base/uclibc/pkg_patch/bash-crosscompile.patch b/base/uclibc/pkg_patch/bash/crosscompile.patch
similarity index 100%
rename from base/uclibc/pkg_patch/bash-crosscompile.patch
rename to base/uclibc/pkg_patch/bash/crosscompile.patch
diff --git a/base/uclibc/pkg_patch/bdb33-uclibc.patch b/base/uclibc/pkg_patch/bdb33/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/bdb33-uclibc.patch
rename to base/uclibc/pkg_patch/bdb33/uclibc.patch
diff --git a/base/uclibc/pkg_patch/binutils-300-001_ld_makefile_patch.patch b/base/uclibc/pkg_patch/binutils/300-001_ld_makefile_patch.patch
similarity index 100%
rename from base/uclibc/pkg_patch/binutils-300-001_ld_makefile_patch.patch
rename to base/uclibc/pkg_patch/binutils/300-001_ld_makefile_patch.patch
diff --git a/base/uclibc/pkg_patch/binutils-300-006_better_file_error.patch b/base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch
similarity index 100%
rename from base/uclibc/pkg_patch/binutils-300-006_better_file_error.patch
rename to base/uclibc/pkg_patch/binutils/300-006_better_file_error.patch
diff --git a/base/uclibc/pkg_patch/binutils-300-012_check_ldrunpath_length.patch b/base/uclibc/pkg_patch/binutils/300-012_check_ldrunpath_length.patch
similarity index 100%
rename from base/uclibc/pkg_patch/binutils-300-012_check_ldrunpath_length.patch
rename to base/uclibc/pkg_patch/binutils/300-012_check_ldrunpath_length.patch
diff --git a/base/uclibc/pkg_patch/bison-30-warn_redefined.patch b/base/uclibc/pkg_patch/bison/30-warn_redefined.patch
similarity index 100%
rename from base/uclibc/pkg_patch/bison-30-warn_redefined.patch
rename to base/uclibc/pkg_patch/bison/30-warn_redefined.patch
diff --git a/base/uclibc/pkg_patch/boehm_gc-uclibc.patch b/base/uclibc/pkg_patch/boehm_gc/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/boehm_gc-uclibc.patch
rename to base/uclibc/pkg_patch/boehm_gc/uclibc.patch
diff --git a/base/uclibc/pkg_patch/bsd_games-uclibc.patch b/base/uclibc/pkg_patch/bsd_games/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/bsd_games-uclibc.patch
rename to base/uclibc/pkg_patch/bsd_games/uclibc.patch
diff --git a/base/uclibc/pkg_patch/cabextract-uclibc.patch b/base/uclibc/pkg_patch/cabextract/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/cabextract-uclibc.patch
rename to base/uclibc/pkg_patch/cabextract/uclibc.patch
diff --git a/base/uclibc/pkg_patch/devfsd-10-uclibc-nis.patch b/base/uclibc/pkg_patch/devfsd/10-uclibc-nis.patch
similarity index 100%
rename from base/uclibc/pkg_patch/devfsd-10-uclibc-nis.patch
rename to base/uclibc/pkg_patch/devfsd/10-uclibc-nis.patch
diff --git a/base/uclibc/pkg_patch/electricfence-uclibc.patch b/base/uclibc/pkg_patch/electricfence/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/electricfence-uclibc.patch
rename to base/uclibc/pkg_patch/electricfence/uclibc.patch
diff --git a/base/uclibc/pkg_patch/emacs-uclibc.patch b/base/uclibc/pkg_patch/emacs/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/emacs-uclibc.patch
rename to base/uclibc/pkg_patch/emacs/uclibc.patch
diff --git a/base/uclibc/pkg_patch/fcgi-lm.patch b/base/uclibc/pkg_patch/fcgi/lm.patch
similarity index 100%
rename from base/uclibc/pkg_patch/fcgi-lm.patch
rename to base/uclibc/pkg_patch/fcgi/lm.patch
diff --git a/base/uclibc/pkg_patch/gcc-100-uclibc-conf.patch b/base/uclibc/pkg_patch/gcc/100-uclibc-conf.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-100-uclibc-conf.patch
rename to base/uclibc/pkg_patch/gcc/100-uclibc-conf.patch
diff --git a/base/uclibc/pkg_patch/gcc-200-uclibc-locale.patch b/base/uclibc/pkg_patch/gcc/200-uclibc-locale.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-200-uclibc-locale.patch
rename to base/uclibc/pkg_patch/gcc/200-uclibc-locale.patch
diff --git a/base/uclibc/pkg_patch/gcc-300-libstdc++-pic.patch b/base/uclibc/pkg_patch/gcc/300-libstdc++-pic.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-300-libstdc++-pic.patch
rename to base/uclibc/pkg_patch/gcc/300-libstdc++-pic.patch
diff --git a/base/uclibc/pkg_patch/gcc-301-missing-execinfo_h.patch b/base/uclibc/pkg_patch/gcc/301-missing-execinfo_h.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-301-missing-execinfo_h.patch
rename to base/uclibc/pkg_patch/gcc/301-missing-execinfo_h.patch
diff --git a/base/uclibc/pkg_patch/gcc-302-c99-snprintf.patch b/base/uclibc/pkg_patch/gcc/302-c99-snprintf.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-302-c99-snprintf.patch
rename to base/uclibc/pkg_patch/gcc/302-c99-snprintf.patch
diff --git a/base/uclibc/pkg_patch/gcc-303-c99-complex-ugly-hack.patch b/base/uclibc/pkg_patch/gcc/303-c99-complex-ugly-hack.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-303-c99-complex-ugly-hack.patch
rename to base/uclibc/pkg_patch/gcc/303-c99-complex-ugly-hack.patch
diff --git a/base/uclibc/pkg_patch/gcc-602-sdk-libstdc++-includes.patch b/base/uclibc/pkg_patch/gcc/602-sdk-libstdc++-includes.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-602-sdk-libstdc++-includes.patch
rename to base/uclibc/pkg_patch/gcc/602-sdk-libstdc++-includes.patch
diff --git a/base/uclibc/pkg_patch/gcc-900-crt-align-1.patch b/base/uclibc/pkg_patch/gcc/900-crt-align-1.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-900-crt-align-1.patch
rename to base/uclibc/pkg_patch/gcc/900-crt-align-1.patch
diff --git a/base/uclibc/pkg_patch/gcc-index.patch b/base/uclibc/pkg_patch/gcc/index.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gcc-index.patch
rename to base/uclibc/pkg_patch/gcc/index.patch
diff --git a/base/uclibc/pkg_patch/gdb-10-uclibc_arch_target.patch b/base/uclibc/pkg_patch/gdb/10-uclibc_arch_target.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gdb-10-uclibc_arch_target.patch
rename to base/uclibc/pkg_patch/gdb/10-uclibc_arch_target.patch
diff --git a/base/uclibc/pkg_patch/gpgme-add_gpg_error.patch b/base/uclibc/pkg_patch/gpgme/add_gpg_error.patch
similarity index 100%
rename from base/uclibc/pkg_patch/gpgme-add_gpg_error.patch
rename to base/uclibc/pkg_patch/gpgme/add_gpg_error.patch
diff --git a/base/uclibc/pkg_patch/hddtemp-no_backtrace.patch b/base/uclibc/pkg_patch/hddtemp/no_backtrace.patch
similarity index 100%
rename from base/uclibc/pkg_patch/hddtemp-no_backtrace.patch
rename to base/uclibc/pkg_patch/hddtemp/no_backtrace.patch
diff --git a/base/uclibc/pkg_patch/libgcrypt-uclibc.patch b/base/uclibc/pkg_patch/libgcrypt/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/libgcrypt-uclibc.patch
rename to base/uclibc/pkg_patch/libgcrypt/uclibc.patch
diff --git a/base/uclibc/pkg_patch/libsafe-uclibc.patch b/base/uclibc/pkg_patch/libsafe/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/libsafe-uclibc.patch
rename to base/uclibc/pkg_patch/libsafe/uclibc.patch
diff --git a/base/uclibc/pkg_patch/lirc-uclibc.patch b/base/uclibc/pkg_patch/lirc/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/lirc-uclibc.patch
rename to base/uclibc/pkg_patch/lirc/uclibc.patch
diff --git a/base/uclibc/pkg_patch/lsof-uclibc.patch b/base/uclibc/pkg_patch/lsof/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/lsof-uclibc.patch
rename to base/uclibc/pkg_patch/lsof/uclibc.patch
diff --git a/base/uclibc/pkg_patch/lua_wsapi-lm.patch b/base/uclibc/pkg_patch/lua_wsapi/lm.patch
similarity index 100%
rename from base/uclibc/pkg_patch/lua_wsapi-lm.patch
rename to base/uclibc/pkg_patch/lua_wsapi/lm.patch
diff --git a/base/uclibc/pkg_patch/man-index.patch b/base/uclibc/pkg_patch/man/index.patch
similarity index 100%
rename from base/uclibc/pkg_patch/man-index.patch
rename to base/uclibc/pkg_patch/man/index.patch
diff --git a/base/uclibc/pkg_patch/metamail-uclibc.patch b/base/uclibc/pkg_patch/metamail/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/metamail-uclibc.patch
rename to base/uclibc/pkg_patch/metamail/uclibc.patch
diff --git a/base/uclibc/pkg_patch/module_init_tools-index.patch b/base/uclibc/pkg_patch/module_init_tools/index.patch
similarity index 100%
rename from base/uclibc/pkg_patch/module_init_tools-index.patch
rename to base/uclibc/pkg_patch/module_init_tools/index.patch
diff --git a/base/uclibc/pkg_patch/mono-uclibc.patch b/base/uclibc/pkg_patch/mono/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/mono-uclibc.patch
rename to base/uclibc/pkg_patch/mono/uclibc.patch
diff --git a/base/uclibc/pkg_patch/mtools-iconv.patch b/base/uclibc/pkg_patch/mtools/iconv.patch
similarity index 100%
rename from base/uclibc/pkg_patch/mtools-iconv.patch
rename to base/uclibc/pkg_patch/mtools/iconv.patch
diff --git a/base/uclibc/pkg_patch/ntp-in6.patch b/base/uclibc/pkg_patch/ntp/in6.patch
similarity index 100%
rename from base/uclibc/pkg_patch/ntp-in6.patch
rename to base/uclibc/pkg_patch/ntp/in6.patch
diff --git a/base/uclibc/pkg_patch/nvi-syssiglist.patch b/base/uclibc/pkg_patch/nvi/syssiglist.patch
similarity index 100%
rename from base/uclibc/pkg_patch/nvi-syssiglist.patch
rename to base/uclibc/pkg_patch/nvi/syssiglist.patch
diff --git a/base/uclibc/pkg_patch/openldap-uclibc.patch b/base/uclibc/pkg_patch/openldap/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/openldap-uclibc.patch
rename to base/uclibc/pkg_patch/openldap/uclibc.patch
diff --git a/base/uclibc/pkg_patch/pam-hostnamemax.patch b/base/uclibc/pkg_patch/pam/hostnamemax.patch
similarity index 100%
rename from base/uclibc/pkg_patch/pam-hostnamemax.patch
rename to base/uclibc/pkg_patch/pam/hostnamemax.patch
diff --git a/base/uclibc/pkg_patch/pam-no_nis.patch b/base/uclibc/pkg_patch/pam/no_nis.patch
similarity index 100%
rename from base/uclibc/pkg_patch/pam-no_nis.patch
rename to base/uclibc/pkg_patch/pam/no_nis.patch
diff --git a/base/uclibc/pkg_patch/parted-uclibc.patch b/base/uclibc/pkg_patch/parted/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/parted-uclibc.patch
rename to base/uclibc/pkg_patch/parted/uclibc.patch
diff --git a/base/uclibc/pkg_patch/php-uclibc.patch b/base/uclibc/pkg_patch/php/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/php-uclibc.patch
rename to base/uclibc/pkg_patch/php/uclibc.patch
diff --git a/base/uclibc/pkg_patch/postfix-uclibc.patch b/base/uclibc/pkg_patch/postfix/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/postfix-uclibc.patch
rename to base/uclibc/pkg_patch/postfix/uclibc.patch
diff --git a/base/uclibc/pkg_patch/procinfo-uclibc.patch b/base/uclibc/pkg_patch/procinfo/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/procinfo-uclibc.patch
rename to base/uclibc/pkg_patch/procinfo/uclibc.patch
diff --git a/base/uclibc/pkg_patch/psmisc-add_libintl.patch b/base/uclibc/pkg_patch/psmisc/add_libintl.patch
similarity index 100%
rename from base/uclibc/pkg_patch/psmisc-add_libintl.patch
rename to base/uclibc/pkg_patch/psmisc/add_libintl.patch
diff --git a/base/uclibc/pkg_patch/psmisc-rpmatch.patch b/base/uclibc/pkg_patch/psmisc/rpmatch.patch
similarity index 100%
rename from base/uclibc/pkg_patch/psmisc-rpmatch.patch
rename to base/uclibc/pkg_patch/psmisc/rpmatch.patch
diff --git a/base/uclibc/pkg_patch/python-uclibc.patch b/base/uclibc/pkg_patch/python/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/python-uclibc.patch
rename to base/uclibc/pkg_patch/python/uclibc.patch
diff --git a/base/uclibc/pkg_patch/qt-uclibc.patch b/base/uclibc/pkg_patch/qt/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/qt-uclibc.patch
rename to base/uclibc/pkg_patch/qt/uclibc.patch
diff --git a/base/uclibc/pkg_patch/rpm-uclibc.patch b/base/uclibc/pkg_patch/rpm/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/rpm-uclibc.patch
rename to base/uclibc/pkg_patch/rpm/uclibc.patch
diff --git a/base/uclibc/pkg_patch/samba-fstab.patch b/base/uclibc/pkg_patch/samba/fstab.patch
similarity index 100%
rename from base/uclibc/pkg_patch/samba-fstab.patch
rename to base/uclibc/pkg_patch/samba/fstab.patch
diff --git a/base/uclibc/pkg_patch/sed-4.1.4-malloc.patch b/base/uclibc/pkg_patch/sed/4.1.4-malloc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/sed-4.1.4-malloc.patch
rename to base/uclibc/pkg_patch/sed/4.1.4-malloc.patch
diff --git a/base/uclibc/pkg_patch/shadow-10-uclibc-innetgr.patch b/base/uclibc/pkg_patch/shadow/10-uclibc-innetgr.patch
similarity index 100%
rename from base/uclibc/pkg_patch/shadow-10-uclibc-innetgr.patch
rename to base/uclibc/pkg_patch/shadow/10-uclibc-innetgr.patch
diff --git a/base/uclibc/pkg_patch/shadow-11-uclibc-l64a.patch b/base/uclibc/pkg_patch/shadow/11-uclibc-l64a.patch
similarity index 100%
rename from base/uclibc/pkg_patch/shadow-11-uclibc-l64a.patch
rename to base/uclibc/pkg_patch/shadow/11-uclibc-l64a.patch
diff --git a/base/uclibc/pkg_patch/tcp_wrappers-10-uclibc.patch b/base/uclibc/pkg_patch/tcp_wrappers/10-uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/tcp_wrappers-10-uclibc.patch
rename to base/uclibc/pkg_patch/tcp_wrappers/10-uclibc.patch
diff --git a/base/uclibc/pkg_patch/tcsh-uclibc.patch b/base/uclibc/pkg_patch/tcsh/uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/tcsh-uclibc.patch
rename to base/uclibc/pkg_patch/tcsh/uclibc.patch
diff --git a/base/uclibc/pkg_patch/whois-add_libintl.patch b/base/uclibc/pkg_patch/whois/add_libintl.patch
similarity index 100%
rename from base/uclibc/pkg_patch/whois-add_libintl.patch
rename to base/uclibc/pkg_patch/whois/add_libintl.patch
diff --git a/base/uclibc/pkg_patch/xconsole-stropts.patch b/base/uclibc/pkg_patch/xconsole/stropts.patch
similarity index 100%
rename from base/uclibc/pkg_patch/xconsole-stropts.patch
rename to base/uclibc/pkg_patch/xconsole/stropts.patch
diff --git a/base/uclibc/pkg_patch/xfsprogs-no_aio_h.patch b/base/uclibc/pkg_patch/xfsprogs/no_aio_h.patch
similarity index 100%
rename from base/uclibc/pkg_patch/xfsprogs-no_aio_h.patch
rename to base/uclibc/pkg_patch/xfsprogs/no_aio_h.patch
diff --git a/base/uclibc/pkg_patch/xorg_server-backtrace.patch b/base/uclibc/pkg_patch/xorg_server/backtrace.patch
similarity index 100%
rename from base/uclibc/pkg_patch/xorg_server-backtrace.patch
rename to base/uclibc/pkg_patch/xorg_server/backtrace.patch