diff --git a/configure.in b/configure.in
index 5b2407893..28456fb9c 100644
--- a/configure.in
+++ b/configure.in
@@ -148,6 +148,9 @@ src/plugins/tool/Makefile
 src/plugins/view/Makefile
 src/plugins/webreport/Makefile
 src/plugins/webstuff/Makefile
+src/plugins/webstuff/css/Makefile
+src/plugins/webstuff/images/Makefile
+src/plugins/webstuff/js/Makefile
 src/DateHandler/Makefile
 src/data/Makefile
 src/glade/Makefile
diff --git a/src/plugins/webstuff/Makefile.am b/src/plugins/webstuff/Makefile.am
index da9c12e40..00dc4458a 100644
--- a/src/plugins/webstuff/Makefile.am
+++ b/src/plugins/webstuff/Makefile.am
@@ -3,62 +3,13 @@
 # but that is not necessarily portable.
 # If not using GNU make, then list all .py files individually
 
-SUBDIRS = 
-
-DATAFILES = \
-	css/GeoView.css \
-	css/Mapstraction.css \
-	css/ancestortree.css \
-	css/behaviour.css \
-	css/Web_Basic-Ash.css \
-	css/Web_Basic-Blue.css \
-	css/Web_Basic-Cypress.css  \
-	css/Web_Basic-Lilac.css \
-	css/Web_Basic-Peach.css \
-	css/Web_Basic-Spruce.css \
-	css/Web_Mainz.css \
-	css/Web_Navigation-Horizontal.css \
-	css/Web_Navigation-Vertical.css \
-	css/Web_Nebraska.css \
-	css/Web_Print-Default.css \
-	css/Web_Visually.css \
-	images/blank.gif \
-	images/crosshairs.png \
-	images/document.png \
-	images/favicon2.ico \
-	images/favicon.ico \
-	images/gramps-geo-altmap.png \
-	images/gramps-geo-altmap.svg \
-	images/gramps-geo-birth.png \
-	images/gramps-geo-birth.svg \
-	images/gramps-geo-death.png \
-	images/gramps-geo-death.svg \
-	images/gramps-geo-mainmap.png \
-	images/gramps-geo-mainmap.svg \
-	images/gramps-geo-marriage.png \
-	images/gramps-geo-marriage.svg \
-	images/somerights20.gif \
-	images/Web_Gender_Female.png \
-	images/Web_Gender_Male.png \
-	images/Web_Mainz_Bkgd.png \
-	images/Web_Mainz_Header.png \
-	images/Web_Mainz_Mid.png \
-	images/Web_Mainz_MidLight.png \
-	js/mapstraction/README \
-	js/mapstraction/mxn.core.js \
-	js/mapstraction/mxn.geocommons.core.js \
-	js/mapstraction/mxn.google.core.js \
-	js/mapstraction/mxn.googleearth.core.js \
-	js/mapstraction/mxn.google.geocoder.js \
-	js/mapstraction/mxn.googlev3.core.js \
-	js/mapstraction/mxn.js \
-	js/mapstraction/mxn.openlayers.core.js
+SUBDIRS = css images
 
 pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff
 
 pkgdata_PYTHON = \
-	webstuff.py \
-	webstuff.gpr.py
+      webstuff.py \
+      webstuff.gpr.py
 
 pkgpyexecdir = @pkgpyexecdir@/plugins/webstuff
 pkgpythondir = @pkgpythondir@/plugins/webstuff
diff --git a/src/plugins/webstuff/css/Makefile.am b/src/plugins/webstuff/css/Makefile.am
new file mode 100644
index 000000000..8c188dab6
--- /dev/null
+++ b/src/plugins/webstuff/css/Makefile.am
@@ -0,0 +1,27 @@
+# This is the src/plugins/webstuff level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+DATAFILES = \
+	GeoView.css \
+	Mapstraction.css \
+	ancestortree.css \
+	behaviour.css \
+	Web_Basic-Ash.css \
+	Web_Basic-Blue.css \
+	Web_Basic-Cypress.css  \
+	Web_Basic-Lilac.css \
+	Web_Basic-Peach.css \
+	Web_Basic-Spruce.css \
+	Web_Mainz.css \
+	Web_Navigation-Horizontal.css \
+	Web_Navigation-Vertical.css \
+	Web_Nebraska.css \
+	Web_Print-Default.css \
+	Web_Visually.css
+
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff/css
+
+dist_pkgdata_DATA = $(DATAFILES)
diff --git a/src/plugins/webstuff/images/Makefile.am b/src/plugins/webstuff/images/Makefile.am
new file mode 100644
index 000000000..2d5005143
--- /dev/null
+++ b/src/plugins/webstuff/images/Makefile.am
@@ -0,0 +1,31 @@
+# This is the src/plugins/webstuff level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+DATAFILES = \
+	crosshairs.png \
+	document.png \
+	favicon2.ico \
+	favicon.ico \
+	gramps-geo-altmap.png \
+	gramps-geo-altmap.svg \
+	gramps-geo-birth.png \
+	gramps-geo-birth.svg \
+	gramps-geo-death.png \
+	gramps-geo-death.svg \
+	gramps-geo-mainmap.png \
+	gramps-geo-mainmap.svg \
+	gramps-geo-marriage.png \
+	gramps-geo-marriage.svg \
+	somerights20.gif \
+	Web_Gender_Female.png \
+	Web_Gender_Male.png \
+	Web_Mainz_Bkgd.png \
+	Web_Mainz_Header.png \
+	Web_Mainz_Mid.png \
+	Web_Mainz_MidLight.png 
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff/images
+
+dist_pkgdata_DATA = $(DATAFILES)
diff --git a/src/plugins/webstuff/js/Makefile.am b/src/plugins/webstuff/js/Makefile.am
new file mode 100644
index 000000000..61f10cebf
--- /dev/null
+++ b/src/plugins/webstuff/js/Makefile.am
@@ -0,0 +1,20 @@
+# This is the src/plugins/webstuff level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+DATAFILES = \
+	mapstraction/README \
+	mapstraction/mxn.core.js \
+	mapstraction/mxn.geocommons.core.js \
+	mapstraction/mxn.google.core.js \
+	mapstraction/mxn.googleearth.core.js \
+	mapstraction/mxn.google.geocoder.js \
+	mapstraction/mxn.googlev3.core.js \
+	mapstraction/mxn.js \
+	mapstraction/mxn.openlayers.core.js
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff/js
+
+dist_pkgdata_DATA = $(DATAFILES)
+