diff --git a/ChangeLog b/ChangeLog
index 60b2beeb3..e6dcd9717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-25  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in : move GACUTIL check forward ahead of a use.
+	* Makefile.include : distcheck fixes
+	* glib/Makefile.am : distcheck fixes
+	* gtkdotnet/Makefile.am : distcheck fixes
+
 2005-08-25  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in : add PLATFORM_WIN32 conditional. Borrow mono's 
diff --git a/Makefile.include b/Makefile.include
index 26fc94593..318852985 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -10,7 +10,7 @@ noinst_DATA = $(TARGET)
 TARGET_API = $(pkg:=-api.xml)
 gapidir = $(datadir)/gapi-2.0
 gapi_DATA = $(TARGET_API)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) glue/generated.c $(SNK)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs
 DISTCLEANFILES = $(ASSEMBLY).config
 
 EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(customs) $(sources) $(add_dist)
@@ -40,8 +40,8 @@ generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.ex
 $(SNK): $(top_srcdir)/$(SNK)
 	cp $(top_srcdir)/$(SNK) .
 
-AssemblyInfo.cs: $(top_srcdir)/AssemblyInfo.cs
-	cp $(top_srcdir)/AssemblyInfo.cs .
+AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
+	cp $(top_builddir)/AssemblyInfo.cs .
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
 build_references = $(addprefix /r:, $(references))
diff --git a/configure.in.in b/configure.in.in
index b20f12d71..422dad31b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -88,6 +88,11 @@ AC_SUBST(BUILD_GTK_LIBS)
 MONO_REQUIRED_VERSION=1.0
 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno" ; then
+	AC_MSG_ERROR([No gacutil tool found. You need to install either the mono or .Net SDK.])
+fi
+
 if test "x$has_mono" = "xtrue"; then
 GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
 GENERATED_SOURCES=generated/*.cs
@@ -126,11 +131,6 @@ if test "x$CSC" = "xno" ; then
 	AC_MSG_ERROR([No $CS compiler found])
 fi
 
-AC_PATH_PROG(GACUTIL, gacutil, no)
-if test "x$GACUTIL" = "xno" ; then
-	AC_MSG_ERROR([No gacutil tool found])
-fi
-
 AC_SUBST(RUNTIME)
 AC_SUBST(CSC)
 AC_SUBST(GACUTIL)
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 76a87624e..705ae7284 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -4,7 +4,7 @@ TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 ASSEMBLY_NAME = glib-sharp
 noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs
 DISTCLEANFILES = $(ASSEMBLY).config
 
 references = 
@@ -66,8 +66,8 @@ EXTRA_DIST =				\
 gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
 	cp $(top_srcdir)/gtk-sharp.snk .
 
-AssemblyInfo.cs: $(top_srcdir)/AssemblyInfo.cs
-	cp $(top_srcdir)/AssemblyInfo.cs .
+AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
+	cp $(top_builddir)/AssemblyInfo.cs .
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk $(ASSEMBLY)
diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am
index 31071d546..60926aaaa 100644
--- a/gtkdotnet/Makefile.am
+++ b/gtkdotnet/Makefile.am
@@ -9,7 +9,7 @@ endif
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 ASSEMBLY_NAME = gtk-dotnet
 noinst_DATA = $(TARGET)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs
 DISTCLEANFILES = $(ASSEMBLY).config
 
 references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../gdk/gdk-sharp.dll
@@ -29,8 +29,8 @@ EXTRA_DIST =				\
 gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
 	cp $(top_srcdir)/gtk-sharp.snk .
 
-AssemblyInfo.cs: $(top_srcdir)/AssemblyInfo.cs
-	cp $(top_srcdir)/AssemblyInfo.cs .
+AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
+	cp $(top_builddir)/AssemblyInfo.cs .
 
 if PLATFORM_WIN32
 GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk $(ASSEMBLY)