diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f57603981..5ee050258 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	* Makefile.am (stmp-targ-include): Support include header files
+	from machine directories.
+	* Makefile.in: Regenerate.
+
 2005-01-24  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/include/string.h: Remove Linux-specific declaration of
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 9ed53679d..afebb6b18 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -201,6 +201,11 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	-for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/`basename $$i`; \
+	    else true; fi ; \
+	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/`basename $$i`; \
@@ -261,6 +266,11 @@ endif
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
+	  for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index 273923d54..c4fa86e2b 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -711,6 +711,11 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	-for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	      cp $$i targ-include/`basename $$i`; \
+	    else true; fi ; \
+	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/`basename $$i`; \
@@ -766,6 +771,11 @@ install-data-local:	install-toollibLIBRARIES
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
+	  for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
+	    if [ -f $$i ]; then \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	    else true; fi ; \
+	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \