diff --git a/awesome.1.txt b/awesome.1.txt
index 20eda6a17..5f8433a50 100644
--- a/awesome.1.txt
+++ b/awesome.1.txt
@@ -9,7 +9,7 @@ awesome - awesome window manager
 SYNOPSIS
 --------
 
-awesome [ -v | --version ] [ -h | --help ] [ -k | --check ] [ -s | --sync ] [ --config | -c configuration file ]
+awesome [ -v | --version ] [ -h | --help ] [ -k | --check ] [ --config | -c configuration file ]
 
 DESCRIPTION
 -----------
@@ -49,9 +49,6 @@ OPTIONS
     Use an alternate configuration file instead of $HOME/.awesomerc.
 --check | -k::
     Check configuration file syntax.
---sync | -s::
-    Enable X11 synchronization mode. All X11 calls will be synchronized,
-    so you can break on exit to retrieve a backtrace of X errors.
 
 DEFAULTS MOUSE BINDINGS
 -----------------------
diff --git a/awesome.c b/awesome.c
index 30b7613df..65823b627 100644
--- a/awesome.c
+++ b/awesome.c
@@ -259,8 +259,7 @@ exit_help(int exit_code)
   -h, --help             show help\n\
   -v, --version          show version\n\
   -c, --config FILE      configuration file to use\n\
-  -k, --check            check configuration file syntax\n\
-  -s  --sync             enable synchronization (X debug)\n");
+  -k, --check            check configuration file syntax\n");
     exit(exit_code);
 }
 
@@ -290,7 +289,6 @@ main(int argc, char *argv[])
         {"version", 0, NULL, 'v'},
         {"check",   0, NULL, 'k'},
         {"config",  1, NULL, 'c'},
-        {"sync",    0, NULL, 's'},
         {NULL,      0, NULL, 0}
     };
 
@@ -365,11 +363,6 @@ main(int argc, char *argv[])
     /* set the default xerror handler */
     xutil_set_error_handler_catch_all(globalconf.evenths, xerror, NULL);
 
-    /* TODO
-    if(xsync)
-        XSynchronize(dpy, true);
-    */
-
     /* Allocate the key symbols */
     globalconf.keysyms = xcb_key_symbols_alloc(conn);