diff --git a/ChangeLog b/ChangeLog
index 64cbc3dc6..6afa489cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-13  Alexander Larsson  <alexl@redhat.com>
+
+	* src/nautilus-file-management-properties.c (nautilus_file_management_properties_dialog_show):
+	Call the response callback on delete_event, with GTK_RESPONSE_CLOSE.
+	
+	* src/nautilus-file-management-properties-mail.c:
+	indentation fix.
+	
+2003-03-13  Alexander Larsson  <alexl@redhat.com>
+
+	* configure.in: 
+	* nautilus.spec.in: 
+	Updated spec file from Neil Weisenfeld <weisen@ai.mit.edu>
+
 2003-03-12  Bastien Nocera  <hadess@hadess.net>
 
 	* src/file-manager/fm-icon-view.c: (icon_view_handle_uri_list): do not
diff --git a/configure.in b/configure.in
index 1132048ac..61dede2bd 100644
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,20 @@ MEDUSA_REQUIRED=0.5.1
 RSVG_REQUIRED=2.0.1
 XML_REQUIRED=2.4.7
 
+AC_SUBST(ART_REQUIRED)
+AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
+AC_SUBST(BONOBO_REQUIRED)
+AC_SUBST(BONOBO_UI_REQUIRED)
 AC_SUBST(EEL_REQUIRED)
+AC_SUBST(ESOUND_REQUIRED)
+AC_SUBST(GLIB_REQUIRED)
+AC_SUBST(GNOME_DESKTOP_REQUIRED)
+AC_SUBST(GNOME_REQUIRED)
+AC_SUBST(GNOME_UI_REQUIRED)
 AC_SUBST(GNOME_VFS_REQUIRED)
+AC_SUBST(ORBIT_REQUIRED)
+AC_SUBST(PANGO_REQUIRED)
+AC_SUBST(GTK_REQUIRED)
 AC_SUBST(MEDUSA_REQUIRED)
 AC_SUBST(RSVG_REQUIRED)
 AC_SUBST(XML_REQUIRED)
diff --git a/nautilus.spec.in b/nautilus.spec.in
index 75858c807..6ec69ee39 100644
--- a/nautilus.spec.in
+++ b/nautilus.spec.in
@@ -6,7 +6,6 @@ Release:          1
 License:          GPL
 Group:            User Interface/Desktop
 Source:           ftp://ftp.gnome.org/pub/GNOME/sources/%{name}-%{version}.tar.gz
-Source2:          fixed-ltmain.sh
 URL:              http://nautilus.eazel.com/
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    pkgconfig >= 0.8
@@ -93,7 +92,6 @@ sed s/relink=yes/relink=no/ ltmain.sh.orig > ltmain.sh
 
 %build
 %configure
-rm ltmain.sh && cp %{SOURCE2} ltmain.sh
 make %{?_smp_mflags}
 
 %install
@@ -115,21 +113,25 @@ make %{?_smp_mflags}
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB ChangeLog INSTALL
 %doc MAINTAINERS NEWS README THANKS TODO
-%doc %{_datadir}/gnome/help/*
+#%doc %{_datadir}/gnome/help/*
+%{_sysconfdir}/gconf/*
 %{_sysconfdir}/X11/serverconfig/.directory
 %{_sysconfdir}/X11/starthere/*
 %{_sysconfdir}/X11/starthere/.directory
 %{_sysconfdir}/X11/sysconfig/.directory
 %{_bindir}/*
 %{_libdir}/*.so*
-%{_libdir}/libnautilus-tree-view.so
+%{_libdir}/bonobo/libnautilus-*-view.so
 %{_libdir}/bonobo/servers/*
+%{_libexecdir}/*
 %{_datadir}/applications/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/idl/*
 %{_datadir}/nautilus
-%doc %{_datadir}/omf/nautilus/*
+%{_datadir}/locale/*/*
 %{_datadir}/pixmaps/*
+%{_datadir}/gnome/network/*
+#%doc %{_datadir}/omf/nautilus/*
 
 
 %files devel
@@ -141,6 +143,15 @@ make %{?_smp_mflags}
 
 
 %changelog
+* Tue Mar 12 2003 Neil Weisenfeld <weisen@ai.mit.edu>
+- Added various file targets: gnome/network, the libexecdir stuff,
+  locale, gconf (do we need to register this somehow?)
+- Fixed nautilus-tree-view to come from lib/bonobo instead of lib/
+- Actually, now pick up nautilus-*-view.so from lib/bonobo
+- Commented out omf and gnome/help documentation.  (should this be
+  coming from somewhere else?)
+- killed dependence on ltmain-fixed.sh as we're "fixing" it in the %prep
+
 * Tue Mar 05 2002 Chris Chabot <chabotc@reviewboard.com>
 - Fixed file list
 - ltmain.sh fix
diff --git a/src/nautilus-file-management-properties-main.c b/src/nautilus-file-management-properties-main.c
index 607c24818..1ec893f39 100644
--- a/src/nautilus-file-management-properties-main.c
+++ b/src/nautilus-file-management-properties-main.c
@@ -38,7 +38,7 @@
 
 static void
 nautilus_file_management_properties_main_close_callback (GtkDialog *dialog,
-		    int response_id)
+							 int response_id)
 {
 	if (response_id == GTK_RESPONSE_CLOSE) {
 		gtk_main_quit ();
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 7242cdec5..b6713590a 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -416,6 +416,21 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo
 	gtk_widget_show (dialog);
 }
 
+static gboolean
+delete_event_callback (GtkWidget       *widget,
+		       GdkEventAny     *event,
+		       gpointer         data)
+{
+	void (*response_callback) (GtkDialog *dialog,
+				   gint response_id);
+
+	response_callback = data;
+
+	response_callback (GTK_DIALOG (widget), GTK_RESPONSE_CLOSE);
+	
+	return TRUE;
+}
+
 void
 nautilus_file_management_properties_dialog_show (GCallback close_callback, GtkWindow *window)
 {
@@ -425,6 +440,8 @@ nautilus_file_management_properties_dialog_show (GCallback close_callback, GtkWi
 	
 	g_signal_connect (G_OBJECT (glade_xml_get_widget (xml_dialog, "file_management_dialog")),
 			  "response", close_callback, NULL);
+	g_signal_connect (G_OBJECT (glade_xml_get_widget (xml_dialog, "file_management_dialog")),
+			  "delete_event", G_CALLBACK (delete_event_callback), close_callback);
 
 	nautilus_file_management_properties_dialog_setup (xml_dialog, window);
 }