diff --git a/ChangeLog b/ChangeLog
index de93f8ea0..9c0e6f652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 21 15:09:17 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* configure.in: patch from Mason Kidd <mrkidd@mrkidd.com> to put
+	back default-applications and remove file-types.
+
 Mon Jul 19 11:09:44 2004  Jonathan Blandford  <jrb@gnome.org>
 
 	* capplets/Makefile.am (always_built_SUBDIRS): 
diff --git a/configure.in b/configure.in
index 2067077f8..d096c6397 100644
--- a/configure.in
+++ b/configure.in
@@ -526,11 +526,9 @@ libgswitchit/Makefile
 libkbdraw/Makefile
 capplets/Makefile
 capplets/common/Makefile
-capplets/background/Makefile
+capplets/default-applications/Makefilecapplets/background/Makefile
 capplets/desktop-links/Makefile
 capplets/display/Makefile
-capplets/file-types/Makefile
-capplets/file-types/libuuid/Makefile
 capplets/font/Makefile
 capplets/keybindings/Makefile
 capplets/keyboard/Makefile