diff --git a/ChangeLog b/ChangeLog
index c832cf371d3d649021fa1f8c05bc52c04fcc34f0..a65ed929b7282ed53df756dae8d9059c3a131e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-21  Niels Möller  <nisse@lysator.liu.se>
+
+	From nettle-2.7-fixes branch:
+	* Makefile.in (distdir): Distribute files in arm/v6 subdirectory.
+
 2013-05-20  Niels Möller  <nisse@lysator.liu.se>
 
 	* arm/v6/sha1-compress.asm: Moved into v6 directory, since it uses
diff --git a/Makefile.in b/Makefile.in
index 2b4f3e5fed81f71c8a93d4b87e9cf26490ab62f2..ebc9357b4a85efd18273e30997ef29f948ae705d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -516,7 +516,7 @@ distdir: $(DISTFILES)
 	  else cp "$(srcdir)/$$f" "$(distdir)" ; \
 	  fi ; \
 	done
-	set -e; for d in sparc32 sparc64 x86 x86_64 arm arm/neon ; do \
+	set -e; for d in sparc32 sparc64 x86 x86_64 arm arm/neon arm/v6 ; do \
 	  mkdir "$(distdir)/$$d" ; \
 	  find "$(srcdir)/$$d" -maxdepth 1 '(' -name '*.asm' -o -name '*.m4' ')' \
 	    -exec cp '{}' "$(distdir)/$$d" ';' ; \