diff --git a/ChangeLog b/ChangeLog
index 11551953a..a46e5cd70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-10  Havoc Pennington  <hp@pobox.com>
+
+	* README: couple of updates
+
+	* src/main.c (usage): add --replace to usage, reported by Matthias
+	Clasen
+
 2002-07-09  Havoc Pennington  <hp@pobox.com>
 
 	* src/metacity.schemas.in: fix short description for 
diff --git a/README b/README
index cb3c28fd4..25a969785 100644
--- a/README
+++ b/README
@@ -136,6 +136,14 @@ METACITY FEATURES
  - considers the panel when placing windows and maximizing
    them.
 
+ - handles the window manager selection from the ICCCM. Will exit if
+   another WM claims it, and can claim it from another WM if you pass
+   the --replace argument. So if you're running another
+   ICCCM-compliant WM, you can run "metacity --replace" to replace it
+   with Metacity.
+
+ - does basic colormap handling
+
 METACITY BUGS, NON-FEATURES, AND CAVEATS
 ===
 
@@ -143,12 +151,8 @@ METACITY BUGS, NON-FEATURES, AND CAVEATS
    to navigate graphically; this does NOT include GNOME 1.x, 
    but should include GNOME 2 and KDE 3.
 
- - I haven't even read the ICCCM section about colormaps. So if you 
-   have an 8-bit display you are probably screwed.
-
- - Metacity doesn't properly claim the window manager selection
-   as described in the ICCCM. But then, most other window managers
-   don't handle this correctly either.
+ - doesn't do WM_COLORMAPS from the ICCCM, may matter on some really
+   old obscure hardware with some really obscure apps.
 
  - There are probably other ICCCM-compliance issues.
 
diff --git a/src/main.c b/src/main.c
index 190c34edc..89d9ca4b7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,7 +60,7 @@ log_handler (const gchar   *log_domain,
 static void
 usage (void)
 {
-  g_print ("metacity [--disable-sm] [--sm-save-file=FILENAME] [--display=DISPLAY]\n");
+  g_print (_("metacity [--disable-sm] [--sm-save-file=FILENAME] [--display=DISPLAY] [--replace]\n"));
   exit (1);
 }