diff --git a/ChangeLog b/ChangeLog
index 4111d742c0..e6bf9830cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies: Remove
+	powerpc/soft-fp.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nofpu/Implies:
+	Likewise.
+	* sysdeps/powerpc/soft-fp/sfp-machine.h: Move to ....
+	* sysdeps/powerpc/nofpu/sfp-machine.h: ... here.
+
 2018-05-24  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
 
 	[BZ #23171]
diff --git a/sysdeps/powerpc/soft-fp/sfp-machine.h b/sysdeps/powerpc/nofpu/sfp-machine.h
similarity index 100%
rename from sysdeps/powerpc/soft-fp/sfp-machine.h
rename to sysdeps/powerpc/nofpu/sfp-machine.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nofpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nofpu/Implies
index 00365c1cfd..aab22f212c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nofpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nofpu/Implies
@@ -1,3 +1,2 @@
 powerpc/powerpc32/e500/nofpu
 powerpc/nofpu
-powerpc/soft-fp
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
index 40836b6fb4..d0e048e87c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/Implies
@@ -1,2 +1 @@
 powerpc/nofpu
-powerpc/soft-fp