diff --git a/doc/ChangeLog b/doc/ChangeLog
index dc03f4af0..39bc52cc0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-04 Mike Kestner <mkestner@ximian.com>
+
+	* Makefile.am : use the ENABLE* ACSUBSTs in make update.
+
 2004-09-03 Mike Kestner <mkestner@ximian.com>
 
 	* en/Gdk/Pixmap.cs : updates to sigs of FromXpm* methods.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1a2d14ce0..6a5a2e225 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,7 +3,49 @@ SUBDIRS = updater
 ASSEMBLER = monodoc --assemble
 UPDATER = $(RUNTIME) updater/updater.exe
 
-DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml vte
+if ENABLE_GLADE
+GLADE_DIR = glade
+else
+GLADE_DIR =
+endif
+
+if ENABLE_GNOME
+GNOME_DIR = art gnome gconf/GConf gconf/GConf.PropertyEditors
+else
+GNOME_DIR =
+endif
+
+if ENABLE_GTKHTML
+GTKHTML_DIR = gtkhtml
+else
+GTKHTML_DIR =
+endif
+
+if ENABLE_GDA
+GDA_DIR = gda
+else
+GDA_DIR =
+endif
+
+if ENABLE_GNOMEDB
+GNOMEDB_DIR = gnomedb
+else
+GNOMEDB_DIR =
+endif
+
+if ENABLE_RSVG
+RSVG_DIR = rsvg
+else
+RSVG_DIR =
+endif
+
+if ENABLE_VTE
+VTE_DIR = vte
+else
+VTE_DIR =
+endif
+
+UPDATE_DIRS=glib pango atk gdk gtk glade $(GNOME_DIR) $(GDA_DIR) $(GNOMEDB_DIR) $(RSVG_DIR) $(GTKHTML_DIR) $(VTE_DIR)
 NAMESPACES=GLib Pango Atk Gdk Gtk Glade Art Gnome Gda GnomeDb GConf GConf.PropertyEditors Rsvg Vte
 
 assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
@@ -12,7 +54,7 @@ gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
 	$(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
 
 update:
-	for i in $(DIRS); do                    		\
+	for i in $(UPDATE_DIRS); do                    		\
 		$(UPDATER) ../$$i/*.dll -o ./en || exit 1;	\
         done