diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index e7073dfe5a..bb38c15398 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,8 @@
 2012-08-14  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/arm/bits/atomic.h: ... this.
+
 	* sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
 	[!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]
 	(atomic_full_barrier): Renamed to ...
diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h b/ports/sysdeps/unix/sysv/linux/arm/bits/atomic.h
similarity index 100%
rename from ports/sysdeps/unix/sysv/linux/arm/nptl/bits/atomic.h
rename to ports/sysdeps/unix/sysv/linux/arm/bits/atomic.h