diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 998de64e1f..26e9538224 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
 ::
 
  --- mpv 0.10.0 will be released ---
+    - remove --slave-broken
     - add vo opengl custom shader suboptions (source-shader, scale-shader,
       pre-shaders, post-shaders)
     - completely change how the hwdec properties work:
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c55f887d1e..f51b471c01 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -348,7 +348,7 @@ Program Behavior
 ``--idle=<no|yes|once>``
     Makes mpv wait idly instead of quitting when there is no file to play.
     Mostly useful in slave mode, where mpv can be controlled through input
-    commands (see also ``--slave-broken``).
+    commands.
 
     ``once`` will only idle at start and let the player close once the
     first playlist has finished playing back.
@@ -2250,8 +2250,6 @@ Input
     This can also specify a direct file descriptor with ``fd://N`` (UNIX only).
     In this case, JSON replies will be written if the FD is writable.
 
-    See also ``--slave-broken``.
-
     .. note::
 
         When the given file is a FIFO mpv opens both ends, so you can do several
@@ -3342,21 +3340,3 @@ Miscellaneous
     Force the contents of the ``media-title`` property to this value. Useful
     for scripts which want to set a title, without overriding the user's
     setting in ``--title``.
-
-``--slave-broken``
-    Switches on the old slave mode. This is for testing only, and incompatible
-    to the removed ``--slave`` switch.
-
-    .. attention::
-        Changes incompatible to slave mode applications have been made. In
-        particular, the status line output was changed, which is used by some
-        applications to determine the current playback position. This switch
-        has been renamed to prevent these applications from working with this
-        version of mpv, because it would lead to buggy and confusing behavior
-        only. Moreover, the slave mode protocol is so horribly bad that it
-        should not be used for new programs, nor should existing programs
-        attempt to adapt to the changed output and use the ``--slave-broken``
-        switch. Instead, a new, saner protocol should be developed (and will be,
-        if there is enough interest).
-
-        This affects most third-party GUI frontends.
diff --git a/DOCS/mplayer-changes.rst b/DOCS/mplayer-changes.rst
index 58b679c9f6..ed916c14d4 100644
--- a/DOCS/mplayer-changes.rst
+++ b/DOCS/mplayer-changes.rst
@@ -397,7 +397,8 @@ Slave mode
 
   Assuming the system supports ``/dev/stdin``.
 
-  (The option was readded in 0.5.1 and sets exactly these options.)
+  (The option was readded in 0.5.1 and sets exactly these options. It was
+  removed in 0.10.x again.)
 
 * A JSON RPC protocol giving access to the client API is also supported. See
   `JSON IPC`_ for more information.
diff --git a/options/options.c b/options/options.c
index b2bd5c2e95..65fadc8e94 100644
--- a/options/options.c
+++ b/options/options.c
@@ -555,8 +555,6 @@ const m_option_t mp_opts[] = {
     OPT_SUBSTRUCT("", encode_opts, encode_config, 0),
 #endif
 
-    OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL),
-
     OPT_REMOVED("a52drc", "use --ad-lavc-ac3drc=level"),
     OPT_REMOVED("afm", "use --ad=..."),
     OPT_REPLACED("aspect", "video-aspect"),
diff --git a/options/options.h b/options/options.h
index 208431110e..a8dd1ade97 100644
--- a/options/options.h
+++ b/options/options.h
@@ -257,8 +257,6 @@ typedef struct MPOpts {
 
     int w32_priority;
 
-    int slave_mode;
-
     int network_cookies_enabled;
     char *network_cookies_file;
     char *network_useragent;
diff --git a/player/main.c b/player/main.c
index a5fb3e7f4d..bb22069bfc 100644
--- a/player/main.c
+++ b/player/main.c
@@ -414,12 +414,6 @@ int mp_initialize(struct MPContext *mpctx, char **options)
     }
     MP_STATS(mpctx, "start init");
 
-    if (opts->slave_mode) {
-        MP_WARN(mpctx, "--slave-broken is deprecated (see manpage).\n");
-        opts->consolecontrols = 0;
-        m_config_set_option0(mpctx->mconfig, "input-file", "/dev/stdin");
-    }
-
     if (!mpctx->playlist->first && !opts->player_idle_mode)
         return -3;