diff --git a/ChangeLog b/ChangeLog
index 2ad5f7de9a..e538bca0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/unix/sysv/linux/aarch64/arch-fork.h: New file.
+	* sysdeps/unix/sysv/linux/aarch64/nptl/fork.c: File removed.
+
 2014-05-21  Joseph Myers  <joseph@codesourcery.com>
 
 	* nscd/Depend (linuxthreads): Remove.
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/fork.c b/sysdeps/unix/sysv/linux/aarch64/arch-fork.h
similarity index 88%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/fork.c
rename to sysdeps/unix/sysv/linux/aarch64/arch-fork.h
index 79a2ec5861..56d26f9f29 100644
--- a/sysdeps/unix/sysv/linux/aarch64/nptl/fork.c
+++ b/sysdeps/unix/sysv/linux/aarch64/arch-fork.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2005-2014 Free Software Foundation, Inc.
-
+/* ARCH_FORK definition for Linux fork implementation.  AArch64 version.
+   Copyright (C) 2005-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,5 +26,3 @@
   INLINE_SYSCALL (clone, 5,						\
 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
 		  NULL, NULL, NULL, &THREAD_SELF->tid)
-
-#include <sysdeps/unix/sysv/linux/fork.c>