diff --git a/ChangeLog b/ChangeLog
index 17dee0c8d5..1a53289d8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-06	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* aclocal/rtems-top.m4: Add pkgdatadir.
+	Override pkgdatadir to $(datadir)/rtems$_RTEMS_API.
+	* Makefile.am: Install make/Templates to pkgdatadir.
+
 2011-03-04	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Merge-in make/Makefile.am.
diff --git a/Makefile.am b/Makefile.am
index 215c865f94..3967faff80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,14 +42,18 @@ dist-hook:
 
 rtems_makedir = $(prefix)/make
 
-dist_rtems_make_DATA = make/main.cfg make/leaf.cfg
+dist_rtems_make_DATA = 
+dist_rtems_make_DATA += make/main.cfg
+dist_rtems_make_DATA += make/leaf.cfg
 
 EXTRA_DIST += make/host.cfg.in
 
-rtems_make_Templatesdir = $(rtems_makedir)/Templates
+rtems_make_Templatesdir = $(pkgdatadir)/make/Templates
 
-dist_rtems_make_Templates_DATA = make/Templates/Makefile.dir \
-    make/Templates/Makefile.leaf make/Templates/Makefile.lib
+dist_rtems_make_Templates_DATA =
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.dir
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.leaf
+dist_rtems_make_Templates_DATA += make/Templates/Makefile.lib
 
 rtems_make_customdir = $(rtems_makedir)/custom
 
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 147455c04b..c6acfd1081 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -31,4 +31,6 @@ AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
 AC_MSG_RESULT([_RTEMS_VERSION])
+pkgdatadir="${datadir}"/rtems[]_RTEMS_API;
+AC_SUBST([pkgdatadir])
 ])dnl