diff --git a/ChangeLog b/ChangeLog
index c56ee7f4a..7bad92e4f 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 89b29b362..7cb96025e 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 fd9b21f44..09e80f669 100644
--- a/configure.in
+++ b/configure.in
@@ -2851,10 +2851,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