diff --git a/Makefile.am b/Makefile.am
index fbbc48ab66d2a7a629d785f70d46d1b1e649f48b..95b71b34209aee746ee262b00845e216b82bd64c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,12 @@
 SUBDIRS = . testsuite
 
+libnettleincludedir = $(includedir)/nettle
+
 lib_LIBRARIES = libnettle.a
-include_HEADERS = arcfour.h
+libnettleinclude_HEADERS = arcfour.h
 
-libnettleincludedir = $(includedir)/nettle
 libnettle_a_SOURCES = aes.c aes.h arcfour.c arcfour.h md5.c md5.h
 
 libnettle_a_LIBADD = @LIBOBJS@
 
-EXTRA_DIST = macros.h
+EXTRA_DIST = macros.h memxor.h