diff --git a/ChangeLog b/ChangeLog
index e360dce06..ee4e499a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-07  Mike Kestner  <mkestner@ximian.com>
+
+	* sample/*/Makefile.am : rebuild if the assemblies change
+
 2004-05-07  Mike Kestner  <mkestner@ximian.com>
 
 	[Derived from a patch by Ben Maurer]
diff --git a/sample/GtkDemo/Makefile.am b/sample/GtkDemo/Makefile.am
index 87783261c..a8a62cc12 100644
--- a/sample/GtkDemo/Makefile.am
+++ b/sample/GtkDemo/Makefile.am
@@ -1,4 +1,5 @@
-references = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../gdk/gdk-sharp.dll /r:../../gtk/gtk-sharp.dll
+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
+references = $(addprefix /r:, $(assemblies))
 TARGETS = GtkDemo.exe
 CLEANFILES = $(TARGETS)
 noinst_SCRIPTS = $(TARGETS)
@@ -26,6 +27,6 @@ sources = 					\
 
 build_sources = $(addprefix $(srcdir)/, $(sources))
 
-GtkDemo.exe: $(build_sources)
+GtkDemo.exe: $(build_sources) $(assemblies)
 	$(CSC) -g /out:GtkDemo.exe $(build_sources) $(references)
 
diff --git a/sample/Makefile.am b/sample/Makefile.am
index a65921c98..6b358643e 100755
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = gconf rsvg test GtkDemo pixmaps
 
 if ENABLE_GNOME
 GNOME_TARGETS=gnome-hello-world.exe canvas-example.exe fifteen.exe print.exe
-GNOME_ASSEMBLY=-r ../art/art-sharp.dll -r ../gnome/gnome-sharp.dll
+GNOME_ASSEMBLY=../art/art-sharp.dll ../gnome/gnome-sharp.dll
 else
 GNOME_TARGETS=
 GNOME_ASSEMBLY=
@@ -10,7 +10,7 @@ endif
 
 if ENABLE_GLADE
 GLADE_TARGETS=glade-viewer.exe glade-test.exe
-GLADE_ASSEMBLY=-r ../glade/glade-sharp.dll
+GLADE_ASSEMBLY=../glade/glade-sharp.dll
 else
 GLADE_TARGETS=
 GLADE_ASSEMBLY=
@@ -18,7 +18,7 @@ endif
 
 if ENABLE_VTE
 VTE_TARGETS=vte-example.exe
-VTE_ASSEMBLY=-r ../vte/vte-sharp.dll
+VTE_ASSEMBLY=../vte/vte-sharp.dll
 else
 VTE_TARGETS=
 VTE_ASSEMBLY=
@@ -26,63 +26,64 @@ endif
 
 TARGETS = gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS)
 
-references=-r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll -r ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY)
+assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY)
+references=$(addprefix -r , $(assemblies))
 
 noinst_SCRIPTS = $(TARGETS)
 CLEANFILES = $(TARGETS)
 
-gtk-hello-world.exe: $(srcdir)/HelloWorld.cs
+gtk-hello-world.exe: $(srcdir)/HelloWorld.cs $(assemblies)
 	$(CSC)  -out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs
 
-gnome-hello-world.exe: $(srcdir)/GnomeHelloWorld.cs
+gnome-hello-world.exe: $(srcdir)/GnomeHelloWorld.cs $(assemblies)
 	$(CSC)  -out:gnome-hello-world.exe $(references) $(srcdir)/GnomeHelloWorld.cs
 
-canvas-example.exe: $(srcdir)/CanvasExample.cs
+canvas-example.exe: $(srcdir)/CanvasExample.cs $(assemblies)
 	$(CSC)  -out:canvas-example.exe $(references) $(srcdir)/CanvasExample.cs
 
-fifteen.exe: $(srcdir)/Fifteen.cs
+fifteen.exe: $(srcdir)/Fifteen.cs $(assemblies)
 	$(CSC)  -out:fifteen.exe $(references) $(srcdir)/Fifteen.cs
 
-print.exe: $(srcdir)/PrintSample.cs
+print.exe: $(srcdir)/PrintSample.cs $(assemblies)
 	$(CSC)  -out:print.exe $(references) $(srcdir)/PrintSample.cs
 
-button.exe: $(srcdir)/ButtonApp.cs
+button.exe: $(srcdir)/ButtonApp.cs $(assemblies)
 	$(CSC)  -out:button.exe $(references) $(srcdir)/ButtonApp.cs
 
-calendar.exe: $(srcdir)/CalendarApp.cs
+calendar.exe: $(srcdir)/CalendarApp.cs $(assemblies)
 	$(CSC)  -out:calendar.exe $(references) $(srcdir)/CalendarApp.cs
 
-subclass.exe: $(srcdir)/Subclass.cs
+subclass.exe: $(srcdir)/Subclass.cs $(assemblies)
 	$(CSC)  -out:subclass.exe $(references) $(srcdir)/Subclass.cs
 
-menu.exe: $(srcdir)/Menu.cs
+menu.exe: $(srcdir)/Menu.cs $(assemblies)
 	$(CSC)  -out:menu.exe $(references) $(srcdir)/Menu.cs
 
-size.exe: $(srcdir)/Size.cs
+size.exe: $(srcdir)/Size.cs $(assemblies)
 	$(CSC)  -out:size.exe $(references) $(srcdir)/Size.cs
 
-scribble.exe: $(srcdir)/Scribble.cs
+scribble.exe: $(srcdir)/Scribble.cs $(assemblies)
 	$(CSC)  -out:scribble.exe $(references) $(srcdir)/Scribble.cs
 
-treeviewdemo.exe: $(srcdir)/TreeViewDemo.cs
+treeviewdemo.exe: $(srcdir)/TreeViewDemo.cs $(assemblies)
 	$(CSC)  -out:treeviewdemo.exe $(references) $(srcdir)/TreeViewDemo.cs
 
-managedtreeviewdemo.exe: $(srcdir)/ManagedTreeViewDemo.cs
+managedtreeviewdemo.exe: $(srcdir)/ManagedTreeViewDemo.cs $(assemblies)
 	$(CSC)  -out:managedtreeviewdemo.exe $(references) $(srcdir)/ManagedTreeViewDemo.cs
 
-glade-viewer.exe: $(srcdir)/GladeViewer.cs
+glade-viewer.exe: $(srcdir)/GladeViewer.cs $(assemblies)
 	$(CSC)  -out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs
 
-glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade
+glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies)
 	$(CSC)  -resource:$(srcdir)/test.glade,test.glade -out:glade-test.exe $(references) $(srcdir)/GladeTest.cs
 
-cairo-sample.exe: $(srcdir)/CairoSample.cs
+cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies)
 	$(CSC) -out:cairo-sample.exe $(references) -r:Mono.Cairo $(srcdir)/CairoSample.cs
 
-testdnd.exe: $(srcdir)/TestDnd.cs
+testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies)
 	$(CSC) -g --unsafe -o testdnd.exe $(references) $(srcdir)/TestDnd.cs
 
-vte-example.exe: $(srcdir)/VteTest.cs
+vte-example.exe: $(srcdir)/VteTest.cs $(assemblies)
 	$(CSC) -g --unsafe -o vte-example.exe $(references) $(srcdir)/VteTest.cs
 
 EXTRA_DIST = 				\
diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am
index d1ee27b55..b432c2bc6 100644
--- a/sample/gconf/Makefile.am
+++ b/sample/gconf/Makefile.am
@@ -10,14 +10,15 @@ FILES = 		\
 
 SCHEMA = $(srcdir)/sample.schema
 RESOURCES = /resource:$(srcdir)/sample.glade
-REFERENCES = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../art/art-sharp.dll /r:../../gdk/gdk-sharp.dll /r:$(GCONFDIR)/GConf/gconf-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../glade/glade-sharp.dll /r:$(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll
+ASSEMBLIES = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../art/art-sharp.dll ../../gdk/gdk-sharp.dll $(GCONFDIR)/GConf/gconf-sharp.dll ../../gtk/gtk-sharp.dll ../../gnome/gnome-sharp.dll ../../glade/glade-sharp.dll $(GCONFDIR)/GConf.PropertyEditors/gconf-sharp-peditors.dll
+REFERENCES = $(addprefix /r:, $(ASSEMBLIES))
 
 top_builddir=../..
 GCONFDIR=$(top_builddir)/gconf
 
 noinst_SCRIPTS = $(TARGET)
 
-sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES)
+sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES)
 	$(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
 
 Settings.cs: $(SCHEMA)
diff --git a/sample/rsvg/Makefile.am b/sample/rsvg/Makefile.am
index 4a4d156be..0960cbfd0 100644
--- a/sample/rsvg/Makefile.am
+++ b/sample/rsvg/Makefile.am
@@ -1,4 +1,5 @@
-references = /r:../../glib/glib-sharp.dll /r:../../pango/pango-sharp.dll /r:../../atk/atk-sharp.dll /r:../../gdk/gdk-sharp.dll /r:../../gtk/gtk-sharp.dll /r:../../glade/glade-sharp.dll /r:../../art/art-sharp.dll /r:../../gnome/gnome-sharp.dll /r:../../rsvg/rsvg-sharp.dll
+assemblies = ../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll ../../glade/glade-sharp.dll ../../art/art-sharp.dll ../../gnome/gnome-sharp.dll ../../rsvg/rsvg-sharp.dll
+references = $(addprefix /r:, $(assemblies))
 
 if ENABLE_RSVG
 TARGETS = svghelloworld.exe
@@ -10,6 +11,6 @@ noinst_SCRIPTS = $(TARGETS)
 EXTRA_DIST = svghelloworld.cs sample.svg
 
 SOURCES = $(srcdir)/svghelloworld.cs
-svghelloworld.exe: $(SOURCES)
+svghelloworld.exe: $(SOURCES) $(assemblies)
 	$(CSC) /out:svghelloworld.exe $(SOURCES) $(references)
 
diff --git a/sample/test/Makefile.am b/sample/test/Makefile.am
index 5292a6d03..ebc492218 100644
--- a/sample/test/Makefile.am
+++ b/sample/test/Makefile.am
@@ -1,6 +1,7 @@
 TARGETS = WidgetViewer.exe 
 
-references=-r ../../glib/glib-sharp.dll -r ../../pango/pango-sharp.dll -r ../../atk/atk-sharp.dll -r ../../gdk/gdk-sharp.dll -r ../../gtk/gtk-sharp.dll
+assemblies=../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
+references = $(addprefix /r:, $(assemblies))
 
 noinst_SCRIPTS = $(TARGETS)
 CLEANFILES = $(TARGETS)
@@ -24,6 +25,6 @@ sources =			\
 
 build_sources = $(addprefix $(srcdir)/, $(sources))
 
-WidgetViewer.exe: $(build_sources)
+WidgetViewer.exe: $(build_sources) $(assemblies)
 	$(CSC) -o WidgetViewer.exe $(references) $(build_sources)