diff --git a/ChangeLog b/ChangeLog
index 6ee264f0f..467e07d81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-15  Dan Winship  <danw@novell.com>
+
+	* sample/opaquetest/Makefile.am (EXTRA_DIST): add missing files
+	(generated/*.cs): fix for srcdir!=builddir
+	* sample/valtest/Makefile.am (EXTRA_DIST): add missing files
+	(Valobj.cs): fix for srcdir!=builddir
+
 2005-08-15  Mike Kestner  <mkestner@novell.com>
 
 	* glib/Object.cs : hold strong refs for managed subclasses and
diff --git a/sample/opaquetest/Makefile.am b/sample/opaquetest/Makefile.am
index 177d003fc..53e0798af 100644
--- a/sample/opaquetest/Makefile.am
+++ b/sample/opaquetest/Makefile.am
@@ -18,7 +18,7 @@ libopaque_la_LIBADD = $(GTK_LIBS)
 INCLUDES = $(GTK_CFLAGS)
 
 generated/*.cs: opaque-api.xml
-	$(RUNTIME) ../../generator/gapi_codegen.exe --generate opaque-api.xml --include ../../gtk/gtk-api.xml ../../gdk/gdk-api.xml --outdir=generated --assembly-name=opaque-sharp
+	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/opaque-api.xml --include ../../gtk/gtk-api.xml ../../gdk/gdk-api.xml --outdir=generated --assembly-name=opaque-sharp
 
 api:
 	PATH=../../parser:$PATH $(RUNTIME) ../../parser/gapi-parser.exe opaque-sources.xml
@@ -28,3 +28,8 @@ install:
 
 CLEANFILES =		\
 	generated/*.cs
+
+EXTRA_DIST =		\
+	OpaqueTest.cs	\
+	opaque-api.xml	\
+	opaque-sources.xml
diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am
index fb43fea85..9f64dd0ff 100644
--- a/sample/valtest/Makefile.am
+++ b/sample/valtest/Makefile.am
@@ -17,8 +17,8 @@ libvalobj_la_LIBADD = $(GTK_LIBS)
 
 INCLUDES = $(GTK_CFLAGS)
 
-Valobj.cs:
-	$(RUNTIME) ../../generator/gapi_codegen.exe --generate valobj-api.xml --include ../../gtk/gtk-api.xml ../../gdk/gdk-api.xml --outdir=. --assembly-name=valobj-sharp
+Valobj.cs: valobj-api.xml
+	$(RUNTIME) ../../generator/gapi_codegen.exe --generate $(srcdir)/valobj-api.xml --include ../../gtk/gtk-api.xml ../../gdk/gdk-api.xml --outdir=. --assembly-name=valobj-sharp
 
 api:
 	PATH=../../parser:$PATH $(RUNTIME) ../../parser/gapi-parser.exe valobj-sources.xml
@@ -27,3 +27,8 @@ install:
 
 CLEANFILES =		\
 	Valobj.cs
+
+EXTRA_DIST =		\
+	Valtest.cs	\
+	valobj-api.xml	\
+	valobj-sources.xml