diff --git a/ChangeLog b/ChangeLog
index 825f76c8da..85e07fae11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-24  David S. Miller  <davem@sunset.davemloft.net>
+
+	* configure.in: Use sparc/sparc32/sparcv9/sparcv9b in place
+	of sparc/sparc32/sparcv9b.
+	* configure: Regenerated.
+	* sysdeps/sparc/sparc32/sparcv9b/Implies: File removed.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/Implies: File removed.
+
 2006-02-24  Roland McGrath  <roland@redhat.com>
 
 	* elf/elf.h (HWCAP_SPARC_BLKINIT): New macro.
diff --git a/configure b/configure
index 3bef4bb245..57fc703459 100755
--- a/configure
+++ b/configure
@@ -1975,7 +1975,7 @@ sparcv8 | supersparc | hypersparc)
 sparcv8plus | sparcv8plusa | sparcv9)
 		base_machine=sparc machine=sparc/sparc32/sparcv9 ;;
 sparcv8plusb | sparcv9b)
-		base_machine=sparc machine=sparc/sparc32/sparcv9b ;;
+		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
 sparc64)
 		base_machine=sparc machine=sparc/sparc64 ;;
 sparc64b)
diff --git a/configure.in b/configure.in
index 889fb55208..6d91fcacea 100644
--- a/configure.in
+++ b/configure.in
@@ -461,7 +461,7 @@ sparcv8 | supersparc | hypersparc)
 sparcv8plus | sparcv8plusa | sparcv9)
 		base_machine=sparc machine=sparc/sparc32/sparcv9 ;;
 sparcv8plusb | sparcv9b)
-		base_machine=sparc machine=sparc/sparc32/sparcv9b ;;
+		base_machine=sparc machine=sparc/sparc32/sparcv9/sparcv9b ;;
 sparc64)
 		base_machine=sparc machine=sparc/sparc64 ;;
 sparc64b)
diff --git a/sysdeps/sparc/dl-procinfo.c b/sysdeps/sparc/dl-procinfo.c
index 71f76aae44..875820fab3 100644
--- a/sysdeps/sparc/dl-procinfo.c
+++ b/sysdeps/sparc/dl-procinfo.c
@@ -50,7 +50,7 @@
 PROCINFO_CLASS const char _dl_sparc_cap_flags[7][7]
 #endif
 #ifndef PROCINFO_DECL
-  = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v" };
+  = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v" }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL
 ;
diff --git a/sysdeps/sparc/sparc32/sparcv9b/Implies b/sysdeps/sparc/sparc32/sparcv9b/Implies
deleted file mode 100644
index 78a424460b..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9b/Implies
+++ /dev/null
@@ -1 +0,0 @@
-sparc/sparc32/sparcv9
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/Implies b/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/Implies
deleted file mode 100644
index 17ed964f79..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/Implies
+++ /dev/null
@@ -1 +0,0 @@
-unix/sysv/linux/sparc/sparc32/sparcv9