diff --git a/ChangeLog b/ChangeLog
index 56ec1f17a3b6eb4d5dd40a1a4c409ae664c90048..a9b0b858e8e5af1ba32ef9cad17050fea7b30bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-02  Michael Natterer  <mitch@imendio.com>
+
+	* configure.in
+	* Makefile.am: remove references to build/ until a proper decision
+	has been made what to do with it.
+
 2007-01-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib-gettextize.in: Silence autoconf warnings about
diff --git a/Makefile.am b/Makefile.am
index 89b29b362ccc86938ae8e84aa8ce3606a669d66f..7cb96025e1323dba6ed9e183bc41b4f3f6096cec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
+SUBDIRS = . m4macros glib gobject gmodule gthread tests po docs
 
 bin_SCRIPTS = glib-gettextize
 
diff --git a/configure.in b/configure.in
index c857a5fd1fbe99c61ab46a5cb879b2c46bcd6c04..d77241a43606bc82e67f0c9091051273c30f9335 100644
--- a/configure.in
+++ b/configure.in
@@ -2838,10 +2838,6 @@ gobject-2.0-uninstalled.pc
 glib-zip
 glib-gettextize
 Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/dirent/Makefile
-build/win32/vs8/Makefile
 glib/Makefile
 glib/libcharset/Makefile
 glib/gnulib/Makefile