diff --git a/awesome.c b/awesome.c
index f387fdc22..6154ec3c4 100644
--- a/awesome.c
+++ b/awesome.c
@@ -260,7 +260,7 @@ acquire_WM_Sn(bool replace)
             xcb_get_selection_owner(globalconf.connection, globalconf.selection_atom),
             NULL);
     if (!replace && get_sel_reply->owner != XCB_NONE)
-        fatal("another window manager is already running (selection owned)");
+        fatal("another window manager is already running (selection owned; use --replace)");
 
     /* Acquire the selection */
     xcb_set_selection_owner(globalconf.connection, globalconf.selection_owner_window,
@@ -436,6 +436,7 @@ main(int argc, char **argv)
     xdgHandle xdg;
     bool no_argb = false;
     bool run_test = false;
+    bool replace_wm = false;
     xcb_query_tree_cookie_t tree_c;
     static struct option long_options[] =
     {
@@ -444,6 +445,7 @@ main(int argc, char **argv)
         { "config",  1, NULL, 'c' },
         { "check",   0, NULL, 'k' },
         { "no-argb", 0, NULL, 'a' },
+        { "replace", 0, NULL, 'r' },
         { NULL,      0, NULL, 0 }
     };
 
@@ -480,7 +482,7 @@ main(int argc, char **argv)
     luaA_init(&xdg);
 
     /* check args */
-    while((opt = getopt_long(argc, argv, "vhkc:a",
+    while((opt = getopt_long(argc, argv, "vhkc:ar",
                              long_options, NULL)) != -1)
         switch(opt)
         {
@@ -502,6 +504,9 @@ main(int argc, char **argv)
           case 'a':
             no_argb = true;
             break;
+          case 'r':
+            replace_wm = true;
+            break;
         }
 
     if (run_test)
@@ -578,7 +583,7 @@ main(int argc, char **argv)
     draw_test_cairo_xcb();
 
     /* Acquire the WM_Sn selection */
-    acquire_WM_Sn(true);
+    acquire_WM_Sn(replace_wm);
 
     /* initialize dbus */
     a_dbus_init();
diff --git a/manpages/awesome.1.de.txt b/manpages/awesome.1.de.txt
index 8f325a6b9..d08e95d00 100644
--- a/manpages/awesome.1.de.txt
+++ b/manpages/awesome.1.de.txt
@@ -35,6 +35,8 @@ OPTIONEN
     Überprüft die Konfigurationsdatei auf Syntaxfehler.
 *-a*, *--no-argb*::
     Verwende keine ARGB-Visuals
+*-r*, *--replace*::
+    Existierenden Fenstermanager ersetzen
 
 TASTENBELEGUNG FÜR MAUSZEIGER
 -----------------------------
diff --git a/manpages/awesome.1.es.txt b/manpages/awesome.1.es.txt
index 237889713..e3fd619ca 100644
--- a/manpages/awesome.1.es.txt
+++ b/manpages/awesome.1.es.txt
@@ -52,6 +52,8 @@ OPCIONES
     Verifica la sintaxis del archivo de configuración.
 *-a*, *--no-argb*::
     No utilice colores ARGB.
+*-r*, *--replace*::
+    Replace an existing window manager
 
 ATAJOS DE RAtÓN POR OMISIÓN
 ---------------------------
diff --git a/manpages/awesome.1.fr.txt b/manpages/awesome.1.fr.txt
index 83779d72e..ac68ea521 100644
--- a/manpages/awesome.1.fr.txt
+++ b/manpages/awesome.1.fr.txt
@@ -45,6 +45,8 @@ OPTIONS
     Vérifie la syntaxe du fichier de configuration.
 *-a*, *--no-argb*::
     N'utilise pas le codage ARGB.
+*-r*, *--replace*::
+    Replace an existing window manager
 
 ASSOCIATIONS AVEC LA SOURIS (PAR DÉFAUT)
 ----------------------------------------
diff --git a/manpages/awesome.1.it.txt b/manpages/awesome.1.it.txt
index 411839dc0..098e19482 100644
--- a/manpages/awesome.1.it.txt
+++ b/manpages/awesome.1.it.txt
@@ -52,6 +52,8 @@ OPZIONI
 	Verifica la sintassi del file di configurazione.
 *-a*, *--no-argb*::
 	Non usare visuali ARGB.
+*-r*, *--replace*::
+	Replace an existing window manager
 
 DEFAULT SCORCIATOIE CON IL MOUSE
 --------------------------------
diff --git a/manpages/awesome.1.ru.txt b/manpages/awesome.1.ru.txt
index d0b828715..63cfa262e 100644
--- a/manpages/awesome.1.ru.txt
+++ b/manpages/awesome.1.ru.txt
@@ -47,6 +47,8 @@ awesome - потрясающий оконный менеджер
     Проверить синтаксис конфигурационного файла.
 *-a*, *--no-argb*::
     Не использовать ARGB.
+*-r*, *--replace*::
+    Replace an existing window manager
 
 НАСТРОЙКИ МЫШИ ПО-УМОЛЧАНИЮ
 ---------------------------
diff --git a/manpages/awesome.1.txt b/manpages/awesome.1.txt
index a7f066e19..5d9efb876 100644
--- a/manpages/awesome.1.txt
+++ b/manpages/awesome.1.txt
@@ -44,6 +44,8 @@ OPTIONS
     Check configuration file syntax.
 *-a*, *--no-argb*::
     Don't use ARGB visuals.
+*-r*, *--replace*::
+    Replace an existing window manager
 
 DEFAULT MOUSE BINDINGS
 -----------------------