diff --git a/patches/glibc/2_9/100-ssp-compat.patch b/patches/glibc/2.9/100-ssp-compat.patch
similarity index 100%
rename from patches/glibc/2_9/100-ssp-compat.patch
rename to patches/glibc/2.9/100-ssp-compat.patch
diff --git a/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch b/patches/glibc/2.9/110-respect-env-CPPFLAGS.patch
similarity index 100%
rename from patches/glibc/2_9/110-respect-env-CPPFLAGS.patch
rename to patches/glibc/2.9/110-respect-env-CPPFLAGS.patch
diff --git a/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch b/patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
similarity index 100%
rename from patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
rename to patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
diff --git a/patches/glibc/2_9/130-add_prio-macros.patch b/patches/glibc/2.9/130-add_prio-macros.patch
similarity index 100%
rename from patches/glibc/2_9/130-add_prio-macros.patch
rename to patches/glibc/2.9/130-add_prio-macros.patch
diff --git a/patches/glibc/2_9/140-regex-BZ9697.patch b/patches/glibc/2.9/140-regex-BZ9697.patch
similarity index 100%
rename from patches/glibc/2_9/140-regex-BZ9697.patch
rename to patches/glibc/2.9/140-regex-BZ9697.patch
diff --git a/patches/glibc/2_9/150-regex-BZ697.patch b/patches/glibc/2.9/150-regex-BZ697.patch
similarity index 100%
rename from patches/glibc/2_9/150-regex-BZ697.patch
rename to patches/glibc/2.9/150-regex-BZ697.patch
diff --git a/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch b/patches/glibc/2.9/160-i386-x86_64-revert-clone-cfi.patch
similarity index 100%
rename from patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch
rename to patches/glibc/2.9/160-i386-x86_64-revert-clone-cfi.patch
diff --git a/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch b/patches/glibc/2.9/170-2.10-dns-no-gethostbyname4.patch
similarity index 100%
rename from patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch
rename to patches/glibc/2.9/170-2.10-dns-no-gethostbyname4.patch
diff --git a/patches/glibc/2_9/180-math-tests.patch b/patches/glibc/2.9/180-math-tests.patch
similarity index 100%
rename from patches/glibc/2_9/180-math-tests.patch
rename to patches/glibc/2.9/180-math-tests.patch
diff --git a/patches/glibc/2_9/190-queue-header-updates.patch b/patches/glibc/2.9/190-queue-header-updates.patch
similarity index 100%
rename from patches/glibc/2_9/190-queue-header-updates.patch
rename to patches/glibc/2.9/190-queue-header-updates.patch
diff --git a/patches/glibc/2_9/200-awk-in-C-locale.patch b/patches/glibc/2.9/200-awk-in-C-locale.patch
similarity index 100%
rename from patches/glibc/2_9/200-awk-in-C-locale.patch
rename to patches/glibc/2.9/200-awk-in-C-locale.patch
diff --git a/patches/glibc/2_9/210-2.9-strlen-hack.patch b/patches/glibc/2.9/210-2.9-strlen-hack.patch
similarity index 100%
rename from patches/glibc/2_9/210-2.9-strlen-hack.patch
rename to patches/glibc/2.9/210-2.9-strlen-hack.patch
diff --git a/patches/glibc/2_9/220-manual-no-perl.patch b/patches/glibc/2.9/220-manual-no-perl.patch
similarity index 100%
rename from patches/glibc/2_9/220-manual-no-perl.patch
rename to patches/glibc/2.9/220-manual-no-perl.patch
diff --git a/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch b/patches/glibc/2.9/230-2.3.3-localedef-fix-trampoline.patch
similarity index 100%
rename from patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch
rename to patches/glibc/2.9/230-2.3.3-localedef-fix-trampoline.patch
diff --git a/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch b/patches/glibc/2.9/240-i386-LOAD_PIC_REG.patch
similarity index 100%
rename from patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch
rename to patches/glibc/2.9/240-i386-LOAD_PIC_REG.patch
diff --git a/patches/glibc/2_9/250-resolv-dynamic.patch b/patches/glibc/2.9/250-resolv-dynamic.patch
similarity index 100%
rename from patches/glibc/2_9/250-resolv-dynamic.patch
rename to patches/glibc/2.9/250-resolv-dynamic.patch
diff --git a/patches/glibc/2_9/260-fadvise64_64.patch b/patches/glibc/2.9/260-fadvise64_64.patch
similarity index 100%
rename from patches/glibc/2_9/260-fadvise64_64.patch
rename to patches/glibc/2.9/260-fadvise64_64.patch
diff --git a/patches/glibc/2_9/270-ldbl-nexttowardf.patch b/patches/glibc/2.9/270-ldbl-nexttowardf.patch
similarity index 100%
rename from patches/glibc/2_9/270-ldbl-nexttowardf.patch
rename to patches/glibc/2.9/270-ldbl-nexttowardf.patch
diff --git a/patches/glibc/2_9/280-section-comments.patch b/patches/glibc/2.9/280-section-comments.patch
similarity index 100%
rename from patches/glibc/2_9/280-section-comments.patch
rename to patches/glibc/2.9/280-section-comments.patch
diff --git a/patches/glibc/2_9/290-no-inline-gmon.patch b/patches/glibc/2.9/290-no-inline-gmon.patch
similarity index 100%
rename from patches/glibc/2_9/290-no-inline-gmon.patch
rename to patches/glibc/2.9/290-no-inline-gmon.patch
diff --git a/patches/glibc/2_9/300-2.9-check_native-headers.patch b/patches/glibc/2.9/300-2.9-check_native-headers.patch
similarity index 100%
rename from patches/glibc/2_9/300-2.9-check_native-headers.patch
rename to patches/glibc/2.9/300-2.9-check_native-headers.patch
diff --git a/patches/glibc/2_9/310-2.3.6-fix-pr631.patch b/patches/glibc/2.9/310-2.3.6-fix-pr631.patch
similarity index 100%
rename from patches/glibc/2_9/310-2.3.6-fix-pr631.patch
rename to patches/glibc/2.9/310-2.3.6-fix-pr631.patch
diff --git a/patches/glibc/2_9/320-2.9-assume-pipe2.patch b/patches/glibc/2.9/320-2.9-assume-pipe2.patch
similarity index 100%
rename from patches/glibc/2_9/320-2.9-assume-pipe2.patch
rename to patches/glibc/2.9/320-2.9-assume-pipe2.patch
diff --git a/patches/glibc/2_9/330-2.3.3-china.patch b/patches/glibc/2.9/330-2.3.3-china.patch
similarity index 100%
rename from patches/glibc/2_9/330-2.3.3-china.patch
rename to patches/glibc/2.9/330-2.3.3-china.patch
diff --git a/patches/glibc/2_9/340-new-valencian-locale.patch b/patches/glibc/2.9/340-new-valencian-locale.patch
similarity index 100%
rename from patches/glibc/2_9/340-new-valencian-locale.patch
rename to patches/glibc/2.9/340-new-valencian-locale.patch
diff --git a/patches/glibc/2_9/350-2.4-undefine-__i686.patch b/patches/glibc/2.9/350-2.4-undefine-__i686.patch
similarity index 100%
rename from patches/glibc/2_9/350-2.4-undefine-__i686.patch
rename to patches/glibc/2.9/350-2.4-undefine-__i686.patch
diff --git a/patches/glibc/2_9/360-2.8-nscd-one-fork.patch b/patches/glibc/2.9/360-2.8-nscd-one-fork.patch
similarity index 100%
rename from patches/glibc/2_9/360-2.8-nscd-one-fork.patch
rename to patches/glibc/2.9/360-2.8-nscd-one-fork.patch
diff --git a/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch b/patches/glibc/2.9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch
similarity index 100%
rename from patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch
rename to patches/glibc/2.9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch
diff --git a/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch b/patches/glibc/2.9/380-2.3.6-dl_execstack-PaX-support.patch
similarity index 100%
rename from patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch
rename to patches/glibc/2.9/380-2.3.6-dl_execstack-PaX-support.patch
diff --git a/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch b/patches/glibc/2.9/390-2.3.3_pre20040117-pt_pax.patch
similarity index 100%
rename from patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch
rename to patches/glibc/2.9/390-2.3.3_pre20040117-pt_pax.patch
diff --git a/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch b/patches/glibc/2.9/400-tests-sandbox-libdl-paths.patch
similarity index 100%
rename from patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch
rename to patches/glibc/2.9/400-tests-sandbox-libdl-paths.patch
diff --git a/patches/glibc/2_9/410-2.9-fnmatch.patch b/patches/glibc/2.9/410-2.9-fnmatch.patch
similarity index 100%
rename from patches/glibc/2_9/410-2.9-fnmatch.patch
rename to patches/glibc/2.9/410-2.9-fnmatch.patch
diff --git a/patches/glibc/2_9/420-dont-build-timezone.patch b/patches/glibc/2.9/420-dont-build-timezone.patch
similarity index 100%
rename from patches/glibc/2_9/420-dont-build-timezone.patch
rename to patches/glibc/2.9/420-dont-build-timezone.patch
diff --git a/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch b/patches/glibc/2.9/430-2.7-cross-compile-nptl.patch
similarity index 100%
rename from patches/glibc/2_9/430-2.7-cross-compile-nptl.patch
rename to patches/glibc/2.9/430-2.7-cross-compile-nptl.patch
diff --git a/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch b/patches/glibc/2.9/440-alpha-glibc-2.4-xstat.patch
similarity index 100%
rename from patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch
rename to patches/glibc/2.9/440-alpha-glibc-2.4-xstat.patch
diff --git a/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch b/patches/glibc/2.9/450-alpha-glibc-2.5-no-page-header.patch
similarity index 100%
rename from patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch
rename to patches/glibc/2.9/450-alpha-glibc-2.5-no-page-header.patch
diff --git a/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch b/patches/glibc/2.9/460-alpha-glibc-2.5-no-asm-elf-header.patch
similarity index 100%
rename from patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch
rename to patches/glibc/2.9/460-alpha-glibc-2.5-no-asm-elf-header.patch
diff --git a/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch b/patches/glibc/2.9/470-alpha-glibc-2.8-creat.patch
similarity index 100%
rename from patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch
rename to patches/glibc/2.9/470-alpha-glibc-2.8-creat.patch
diff --git a/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch b/patches/glibc/2.9/480-alpha-glibc-2.8-cache-shape.patch
similarity index 100%
rename from patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch
rename to patches/glibc/2.9/480-alpha-glibc-2.8-cache-shape.patch
diff --git a/patches/glibc/2_9/490-ptr-mangling.patch b/patches/glibc/2.9/490-ptr-mangling.patch
similarity index 100%
rename from patches/glibc/2_9/490-ptr-mangling.patch
rename to patches/glibc/2.9/490-ptr-mangling.patch
diff --git a/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch b/patches/glibc/2.9/500-ppc-glibc-2.9-atomic.patch
similarity index 100%
rename from patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch
rename to patches/glibc/2.9/500-ppc-glibc-2.9-atomic.patch
diff --git a/patches/glibc/2_9/510-sh-no-asm-user-header.patch b/patches/glibc/2.9/510-sh-no-asm-user-header.patch
similarity index 100%
rename from patches/glibc/2_9/510-sh-no-asm-user-header.patch
rename to patches/glibc/2.9/510-sh-no-asm-user-header.patch
diff --git a/patches/glibc/2_9/520-sh-no-asm-elf-header.patch b/patches/glibc/2.9/520-sh-no-asm-elf-header.patch
similarity index 100%
rename from patches/glibc/2_9/520-sh-no-asm-elf-header.patch
rename to patches/glibc/2.9/520-sh-no-asm-elf-header.patch
diff --git a/patches/glibc/ports-2_9/100-arm_linux_tls.patch b/patches/glibc/ports-2.9/100-arm_linux_tls.patch
similarity index 100%
rename from patches/glibc/ports-2_9/100-arm_linux_tls.patch
rename to patches/glibc/ports-2.9/100-arm_linux_tls.patch