diff --git a/.gitattributes b/.gitattributes
index 9847604..f5b1f6a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -516,6 +516,7 @@ src/include/H5_attribs.h -text
 src/include/H5hut.h -text
 src/include/Makefile.am -text
 src/include/grephdr -text
+src/include/h5core/Makefile.am -text
 src/include/h5core/h5_attach.h -text
 src/include/h5core/h5_attribs.h -text
 src/include/h5core/h5_core.h -text
diff --git a/Makefile.am b/Makefile.am
index 37ded14..95e301d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = autogen.sh
 
 SUBDIRS = \
 	src \
diff --git a/configure.ac b/configure.ac
index a8de117..9f6dd20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,6 +347,7 @@ AC_CONFIG_FILES([
 	src/Makefile
 	src/h5core/Makefile
 	src/include/Makefile
+	src/include/h5core/Makefile
         src/C/Makefile
         src/Fortran/Makefile
 	test/Makefile
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 65c1994..1955d25 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,38 +1,3 @@
 
-# Header files that I wish to install in $(prefix)/include
-include_HEADERS =						\
-	$(top_srcdir)/src/include/h5core/h5_attach.h		\
-	$(top_srcdir)/src/include/h5core/h5_attribs.h		\
-	$(top_srcdir)/src/include/h5core/h5_core.h		\
-	$(top_srcdir)/src/include/h5core/h5_errno.h		\
-	$(top_srcdir)/src/include/h5core/h5_errorhandling.h	\
-	$(top_srcdir)/src/include/h5core/h5_hdf5.h		\
-	$(top_srcdir)/src/include/h5core/h5_maps.h		\
-	$(top_srcdir)/src/include/h5core/h5_openclose.h	\
-	$(top_srcdir)/src/include/h5core/h5_readwrite.h	\
-	$(top_srcdir)/src/include/h5core/h5_syscall.h		\
-	$(top_srcdir)/src/include/h5core/h5_types.h		\
-	$(top_srcdir)/src/include/h5core/h5b_attribs.h		\
-	$(top_srcdir)/src/include/h5core/h5b_model.h		\
-	$(top_srcdir)/src/include/h5core/h5b_readwrite.h	\
-	$(top_srcdir)/src/include/h5core/h5t_adjacencies.h	\
-	$(top_srcdir)/src/include/h5core/h5t_core.h		\
-	$(top_srcdir)/src/include/h5core/h5t_inquiry.h		\
-	$(top_srcdir)/src/include/h5core/h5t_map.h		\
-	$(top_srcdir)/src/include/h5core/h5t_model.h		\
-	$(top_srcdir)/src/include/h5core/h5t_readwrite.h	\
-	$(top_srcdir)/src/include/h5core/h5t_ref_elements.h	\
-	$(top_srcdir)/src/include/h5core/h5t_retrieve.h	\
-	$(top_srcdir)/src/include/h5core/h5t_storemesh.h	\
-	$(top_srcdir)/src/include/h5core/h5t_tags.h		\
-	$(top_srcdir)/src/include/h5core/h5u_model.h		\
-	$(top_srcdir)/src/include/h5core/h5u_readwrite.h
+SUBDIRS = h5core
 
-# Listing of all possible headers that I may include
-EXTRA_HEADERS =
-
-EXTRA_DIST = Makefile.in
-
-clean-local:
-	$(RM) *~
-	$(RM) h5core/*~
diff --git a/src/include/h5core/Makefile.am b/src/include/h5core/Makefile.am
new file mode 100644
index 0000000..7dea493
--- /dev/null
+++ b/src/include/h5core/Makefile.am
@@ -0,0 +1,37 @@
+otherincludedir = $(includedir)/h5core
+
+otherinclude_HEADERS =		\
+	h5_attach.h		\
+	h5_attribs.h		\
+	h5_core.h		\
+	h5_errno.h		\
+	h5_errorhandling.h	\
+	h5_hdf5.h		\
+	h5_maps.h		\
+	h5_openclose.h		\
+	h5_readwrite.h		\
+	h5_syscall.h		\
+	h5_types.h		\
+	h5b_attribs.h		\
+	h5b_model.h		\
+	h5b_readwrite.h		\
+	h5t_adjacencies.h	\
+	h5t_core.h		\
+	h5t_inquiry.h		\
+	h5t_map.h		\
+	h5t_model.h		\
+	h5t_readwrite.h		\
+	h5t_ref_elements.h	\
+	h5t_retrieve.h		\
+	h5t_storemesh.h		\
+	h5t_tags.h		\
+	h5u_model.h		\
+	h5u_readwrite.h
+
+EXTRA_HEADERS =
+
+EXTRA_DIST =
+
+clean-local:
+	$(RM) *~
+	$(RM) h5core/*~