diff --git a/ChangeLog b/ChangeLog
index ed92bb05a0..e92a674f5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jun  6 11:16:12 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* Makefile.am
+	* app/Makefile.am
+	* libgimp/Makefile.am
+	* plug-ins/rcm/Makefile.am: various dist fixes
+
 1999-06-06  Michael Natterer  <mitschel@cs.tu-berlin.de>
 
 	* app/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index fbf545aa7a..e4dfc026da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,50 +27,52 @@ EXTRA_DIST = \
 	cursors/mouse1_selmmsk	\
 	cursors/mouse1_selp	\
 	cursors/mouse1_selpmsk	\
-	pixmaps/anchor.xpm	 \
-	pixmaps/chain.xpm	 \
-	pixmaps/channel.xbm	 \
-	pixmaps/delete.xpm	 \
-	pixmaps/duplicate.xpm	 \
-	pixmaps/eye.xbm		 \
-	pixmaps/layer.xbm	 \
-	pixmaps/linked.xbm	 \
-	pixmaps/locked.xpm	 \
-	pixmaps/lower.xpm	 \
-	pixmaps/mask.xbm	 \
-	pixmaps/new.xpm		 \
-	pixmaps/no.xpm		 \
-	pixmaps/raise.xpm	 \
-	pixmaps/path.xbm	 \
-	pixmaps/penadd.xpm	 \
-	pixmaps/pendel.xpm	 \
-	pixmaps/penedit.xpm	 \
-	pixmaps/pennorm.xpm	 \
-	pixmaps/penstroke.xpm	 \
-	pixmaps/toselection.xpm  \
-	pixmaps/yes.xpm          \
-	pixmaps/zoom_in.xpm	 \
-	pixmaps/zoom_out.xpm	 \
-	README.i18n		 \
-	README.win32		 \
-	README.perl		 \
-	ChangeLog.pre-1-0	 \
-	MAINTAINERS		 \
-	TODO			 \
-	gtkrc			 \
-	unitrc			 \
-	gimp_logo.ppm		 \
-	gimp_splash.ppm		 \
-	gimp1_1_splash.ppm	 \
-	rmshm			 \
-	user_install		 \
-	user_install.bat	 \
-	ps-menurc		 \
-	gimp.1			 \
-	gimptool.1		 \
-	gtkrc.forest2		 \
-	gimp.m4			 \
-	gimprc.win32		 \
+	cursors/mouse1_u	\
+	cursors/mouse1_umsk	\
+	pixmaps/anchor.xpm	\
+	pixmaps/chain.xpm	\
+	pixmaps/channel.xbm	\
+	pixmaps/delete.xpm	\
+	pixmaps/duplicate.xpm	\
+	pixmaps/eye.xbm		\
+	pixmaps/layer.xbm	\
+	pixmaps/linked.xbm	\
+	pixmaps/locked.xpm	\
+	pixmaps/lower.xpm	\
+	pixmaps/mask.xbm	\
+	pixmaps/new.xpm		\
+	pixmaps/no.xpm		\
+	pixmaps/raise.xpm	\
+	pixmaps/path.xbm	\
+	pixmaps/penadd.xpm	\
+	pixmaps/pendel.xpm	\
+	pixmaps/penedit.xpm	\
+	pixmaps/pennorm.xpm	\
+	pixmaps/penstroke.xpm	\
+	pixmaps/toselection.xpm	\
+	pixmaps/yes.xpm         \
+	pixmaps/zoom_in.xpm	\
+	pixmaps/zoom_out.xpm	\
+	README.i18n		\
+	README.win32		\
+	README.perl		\
+	ChangeLog.pre-1-0	\
+	MAINTAINERS		\
+	TODO			\
+	gtkrc			\
+	unitrc			\
+	gimp_logo.ppm		\
+	gimp_splash.ppm		\
+	gimp1_1_splash.ppm	\
+	rmshm			\
+	user_install		\
+	user_install.bat	\
+	ps-menurc		\
+	gimp.1			\
+	gimptool.1		\
+	gtkrc.forest2		\
+	gimp.m4			\
+	gimprc.win32		\
 	config.h.win32
 
 gimpdata_DATA = \
diff --git a/app/Makefile.am b/app/Makefile.am
index 159cff0107..aeccf8a2e0 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -388,6 +388,7 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimp.def		\
 	gimp.rc			\
+	gimp.sym		\
 	wilber.ico
 
 
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 2c1bc7c26b..489864baef 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -120,7 +120,8 @@ gimpinclude_HEADERS = \
 	gserialize.h		\
 	parasite.h		\
 	parasiteF.h		\
-	parasiteP.h
+	parasiteP.h		\
+	stdplugins-intl.h
 
 libgimp_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/rcm/Makefile.am
index 41f8f08d57..81ceacd1d6 100644
--- a/plug-ins/rcm/Makefile.am
+++ b/plug-ins/rcm/Makefile.am
@@ -14,7 +14,8 @@ rcm_SOURCES = \
 	rcm_gdk.c	\
 	rcm_gdk.h	\
 	rcm_misc.c	\
-	rcm_misc.h
+	rcm_misc.h	\
+	rcm_pixmaps.h
 
 INCLUDES = \
 	-I$(top_srcdir)			\
diff --git a/tools/gcg/ChangeLog b/tools/gcg/ChangeLog
index 36bd90e384..582bbf2159 100644
--- a/tools/gcg/ChangeLog
+++ b/tools/gcg/ChangeLog
@@ -1,4 +1,10 @@
+Sun Jun  6 11:16:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* Makefile.am
+	* configure.in: various dist fixes
+
 1999-05-19  Tor Lillqvist  <tml@iki.fi>
+
 	* Makefile.am: Distribute getopt.c and makefile.msc.
 
 	* getopt.c makefile.msc: New files.
diff --git a/tools/gcg/Makefile.am b/tools/gcg/Makefile.am
index 8d5ce67ab8..3827fb5f23 100644
--- a/tools/gcg/Makefile.am
+++ b/tools/gcg/Makefile.am
@@ -4,10 +4,13 @@ noinst_PROGRAMS = gcg
 
 EXTRA_DIST = \
 	getopt.c	\
-	makefile.msc
+	makefile.msc	\
+	gh/gcg.gh	\
+	gh/glib.gh	\
+	gh/gtk.gh
 
-#CPPFLAGS		= -DCPP_SEARCH=\"" -I $(datadir)/gcg -I ."\"
-CPPFLAGS		= -DCPP_SEARCH=\"" -I ."\"
+#AM_CPPFLAGS		= -DCPP_SEARCH=\"" -I $(datadir)/gcg -I ."\"
+AM_CPPFLAGS		= -DCPP_SEARCH=\"" -I ."\"
 INCLUDES		= @GLIB_CFLAGS@
 YFLAGS			= -d -v
 LFLAGS			= -d 
@@ -25,3 +28,9 @@ gcg_SOURCES = \
 	output_object.c	\
 	fp.c		\
 	marshall.c
+
+if FALSE
+ex = ex
+endif
+
+SUBDIRS = $(ex)
diff --git a/tools/gcg/configure.in b/tools/gcg/configure.in
index f767858575..f8ce85276c 100644
--- a/tools/gcg/configure.in
+++ b/tools/gcg/configure.in
@@ -10,6 +10,9 @@ AC_PROG_RANLIB
 AC_PROG_YACC
 AM_PROG_LEX
 
+dnl Utility conditional
+AM_CONDITIONAL(FALSE, test x = y)
+
 AM_PATH_GLIB(1.0.0,,AC_ERROR(need at least Glib version 1.0))
 
 CPP_PROGRAM="$CPP"