diff --git a/Makefile.am b/Makefile.am
index 842b7b464..a709c1230 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,9 +27,11 @@ check_LTLIBRARIES =
 pkglib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_HEADERS =
+dist_pkgdata_DATA =
 BUILT_SOURCES =
 EXTRA_DIST =
 SUBDIRS =
+CLEANFILES =
 
 # global pre-processor flags. Per-target variables should include
 # these at the front (if possible) for consistency
diff --git a/icons/Makefile.am b/icons/Makefile.am
index d8ec425de..c4bb2c8ca 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -32,17 +32,19 @@ iconcommand = python $(top_srcdir)/admin/render-icon.py
 32x32pre = $(prerendereddir)/32x32
 48x48pre = $(prerendereddir)/48x48
 
-lumigui_DEPENDENCIES += \
-	$(16x16)/tool-arrow.png $(22x22)/tool-arrow.png $(24x24)/tool-arrow.png $(32x32)/tool-arrow.png $(48x48)/tool-arrow.png \
-	$(16x16)/tool-i-beam.png $(22x22)/tool-i-beam.png $(24x24)/tool-i-beam.png $(32x32)/tool-i-beam.png $(48x48)/tool-i-beam.png \
-	$(16x16)/track-disabled.png \
-	$(16x16)/track-enabled.png \
-	$(16x16)/track-locked.png \
-	$(16x16)/track-unlocked.png \
-	$(16x16)/panel-assets.png $(22x22)/panel-assets.png $(32x32)/panel-assets.png \
-	$(16x16)/panel-timeline.png \
+dist_pkgdata_DATA +=															\
+	$(16x16)/tool-arrow.png $(22x22)/tool-arrow.png $(24x24)/tool-arrow.png $(32x32)/tool-arrow.png $(48x48)/tool-arrow.png		\
+	$(16x16)/tool-i-beam.png $(22x22)/tool-i-beam.png $(24x24)/tool-i-beam.png $(32x32)/tool-i-beam.png $(48x48)/tool-i-beam.png	\
+	$(16x16)/track-disabled.png													\
+	$(16x16)/track-enabled.png													\
+	$(16x16)/track-locked.png													\
+	$(16x16)/track-unlocked.png													\
+	$(16x16)/panel-assets.png $(22x22)/panel-assets.png $(32x32)/panel-assets.png							\
+	$(16x16)/panel-timeline.png													\
 	$(16x16)/panel-viewer.png $(22x22)/panel-viewer.png $(32x32)/panel-viewer.png
 
+clean-local:
+	rm -rf $(16x16) $(22x22) $(24x24) $(32x32) $(48x48)
 
 # ========== SVG Icons ==========
 
@@ -73,7 +75,7 @@ $(22x22)/panel-assets.png:
 	cp $(22x22pre)/panel-assets.png $(22x22)
 $(32x32)/panel-assets.png:
 	cp $(32x32pre)/panel-assets.png $(32x32)
-	
+
 $(16x16)/panel-timeline.png:
 	cp $(16x16pre)/panel-timeline.png $(16x16)
 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index fb73e3d29..fe1712a1a 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -46,17 +46,20 @@ lumigui_SOURCES =				\
 	$(lumigui_srcdir)/gtk-lumiera.cpp	\
 	$(lumigui_srcdir)/gtk-lumiera.hpp
 
-lumigui_DEPENDENCIES =				\
-	$(top_builddir)/lumiera_ui.rc		\
-	$(top_builddir)/liblumieracommon.la	\
-	$(top_builddir)/liblumiera.la		\
-	$(top_builddir)/liblumierabackend.la	\
-	$(top_builddir)/liblumieraproc.la
+
+#
+# themes, locales and other supplemental data
+#
+dist_pkgdata_DATA += lumiera_ui.rc
+CLEANFILES += lumiera_ui.rc
+
+lumiera_ui.rc:
+	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)
+
 
 #
 # gtk_gui.lum becomes the pluginized gui
 #
-
 pkglib_LTLIBRARIES += gtk_gui.la
 
 gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
@@ -169,9 +172,4 @@ libgui_la_LIBADD =		\
 	$(NOBUGMT_LUMIERA_LIBS)
 
 
-#
-# themes, locales and other supplemental data
-#
-$(top_builddir)/lumiera_ui.rc:
-	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)