diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index e1267dcf3e..e548186502 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* glade/Makefile.am: clean up a bit
+	* gimages/Makefile.am (dist_noinst_DATA): ditto
+
 2004-12-02  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* GTableCreate.C: use size_t-like types for cell, row and column
@@ -5,12 +10,12 @@
 
 2004-11-29  John Spray  <spray_john@users.sourceforge.net>
 
-	* GToolbar.C: Make layouts combobox not expand to full height 
+	* GToolbar.C: Make layouts combobox not expand to full height
 		of toolbar, it looks more like a combobox this way.
 
 2004-11-26  John Spray  <spray_john@users.sourceforge.net>
-	
-	* FileDialogPrivate.[Ch]: use Gtk::FileChooser, add 
+
+	* FileDialogPrivate.[Ch]: use Gtk::FileChooser, add
 		filtering.
 
 2004-11-25  John Spray  <spray_john@users.sourceforge.net>
diff --git a/src/frontends/gtk/gimages/Makefile.am b/src/frontends/gtk/gimages/Makefile.am
index a9768b2d9d..1eb19e5212 100644
--- a/src/frontends/gtk/gimages/Makefile.am
+++ b/src/frontends/gtk/gimages/Makefile.am
@@ -1,4 +1,15 @@
-EXTRA_DIST = \
-	ams_arrow.xpm ams_brel.xpm ams_misc.xpm ams_nrel.xpm \
-	ams_ops.xpm arrow.xpm boperator.xpm brelats.xpm \
-	dots.xpm greek.xpm Makefile.am misc.xpm varsize.xpm
+include $(top_srcdir)/config/common.am
+
+dist_noinst_DATA = \
+	ams_arrow.xpm \
+	ams_brel.xpm \
+	ams_misc.xpm \
+	ams_nrel.xpm \
+	ams_ops.xpm \
+	arrow.xpm \
+	boperator.xpm \
+	brelats.xpm \
+	dots.xpm \
+	greek.xpm \
+	misc.xpm \
+	varsize.xpm
diff --git a/src/frontends/gtk/glade/Makefile.am b/src/frontends/gtk/glade/Makefile.am
index 46a275ac6c..4045b47210 100644
--- a/src/frontends/gtk/glade/Makefile.am
+++ b/src/frontends/gtk/glade/Makefile.am
@@ -1,9 +1,9 @@
-DISTCLEANFILES = *.orig *.rej *~ *.bak *.gladep
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
 
-GLADE_DIR = glade
+DISTCLEANFILES += *.gladep
 
-GLADE_FILES = \
+gladedir = $(pkgdatadir)/glade
+dist_glade_DATA = \
 	aboutlyx.glade \
 	character.glade \
 	mathDelim.glade \
@@ -13,17 +13,3 @@ GLADE_FILES = \
 	tableCreate.glade \
 	text.glade \
 	url.glade
-
-EXTRA_DIST = ${GLADE_FILES}
-
-gladeinstalldirs:
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/${GLADE_DIR} ;
-
-install-data-local: gladeinstalldirs
-	files=`cd $(srcdir) ; echo $(GLADE_FILES)` ; \
-	for i in $${files} ; do \
-	   $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgdatadir)/${GLADE_DIR}/$$i ; \
-	done
-
-dist-hook:
-	cd $(distdir) ; rm -rf `find . -name \*CVS\*` ;