diff --git a/INSTALL b/INSTALL
index 6610426..e578197 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,6 +8,7 @@ Quick install:
 make
 make install        
 
+
 - You must install the sane-backends package before you can configure this
   package. If you use pre-compiled binaries (e.g. from your distribution) you
   will also have to install the SANE headers (maybe in a package called
@@ -18,7 +19,7 @@ make install
   its header files. GTK can be found at http://www.gtk.org/.
 
 - If you want to use xscanimage as a GIMP plug-in, the GIMP libraries and
-  headers are necessary.
+  headers are necessary. See http://www.gimp.org/.
 
 - If you get an error message that libsane-dll.so.1 or libsane-so.1 is not
   found, you have to tell your system where the SANE-libraries are installed.
diff --git a/README b/README
index 64551b8..cf6791d 100644
--- a/README
+++ b/README
@@ -1,7 +1,11 @@
-This is the sane-frontends package.
+This is the sane-frontends package. 
 
-These frontends are included in this package (together with their
-documentation):
+To find out more about SANE (Scanner Access Now Easy) look at the SANE
+website: http://www.mostang.com/sane/. There is also information on how to
+subscribe the SANE-mailinglist (sane-devel).
+
+These SANE applications (frontends) are included in this package (together
+with their documentation):
 
     Frontend               Documentation (man page) 
 --------------------------------------------------------------------------
@@ -26,6 +30,9 @@ The following frontends can be downloaded seperately:
     sanecgi (http://www.boutell.com/sanecgi/)
        A web interface to all SANE-compatible scanners
 
-See also http://panda.mostang.com/sane/sane-frontends.html for a list of
+See also http://www.mostang.com/sane/sane-frontends.html for a list of
 frontends.
 
+Developers may wish to look at the SANE standard (sane.tex). It can be found
+in the sane-backends distribution or in various file formats at the website:
+http://www.mostang.com/sane/docs.html
diff --git a/TODO b/TODO
index 5b9b654..01923ec 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-TODO (2000-11-11)
+TODO (2000-11-12)
 
 ******** todo ********
 
@@ -37,11 +37,6 @@ TODO (2000-11-11)
     with old GIMP versions if possible. Maybe two source/header files
     for compatibility with old API?
 
-  * xcam: if the user quits xcam by the window manager, the process isn't
-    killed, only the window is closed
-
-  * remove compiler warnings 
-
   * Test frontends on different os/platforms, fix possible compilation
     problems 
 
@@ -49,6 +44,8 @@ TODO (2000-11-11)
 
 ******** done ********
 
+  * xcam: if the user quits xcam by the window manager, the process isn't
+    killed, only the window is closed
   * Remove frontends (at least xscanimage/xcam) from distribution. Create
     new package for frontends. 
 
diff --git a/src/xcam.c b/src/xcam.c
index 5afea26..4c1b1ec 100644
--- a/src/xcam.c
+++ b/src/xcam.c
@@ -878,6 +878,15 @@ xcam_exit (void)
   gtk_exit (0);
 }
 
+/* Invoked when window manager's "delete" (or "close") function is
+   invoked.  */
+static gint
+xcam_win_delete (GtkWidget *w, gpointer data)
+{
+  xcam_exit();
+  return FALSE;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -904,6 +913,8 @@ main (int argc, char **argv)
   win.gdk_input_tag = -1;
   win.shell = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (win.shell), (char *) prog_name);
+  gtk_signal_connect (GTK_OBJECT (win.shell), "delete_event",
+		      GTK_SIGNAL_FUNC (xcam_win_delete), NULL);
 
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_border_width (GTK_CONTAINER (vbox), 0);