diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index acc98ed2a1b..a147d4bdeb3 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -517,12 +517,6 @@ is only done with @kbd{M-x executable-set-magic}.  When this is
 called as a function, such as when Emacs puts a buffer in Shell script
 mode.  Otherwise you are always queried.
 
-@findex executable-self-display
-  @kbd{M-x executable-self-display} adds a magic number to the buffer, which
-will turn it into a self displaying text file, when called as a Un*x command.
-The ``interpreter'' used is @code{executable-self-display} with argument
-@samp{+2}.
-
 @node Timestamps
 @chapter Maintaining Timestamps in Modified Files
 @cindex timestamps
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index 367a2e72d74..50e4da93c73 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -109,6 +109,8 @@ Note that the like of `more' doesn't work too well under Emacs \\[shell]."
   :type 'string
   :group 'executable)
 
+(make-obsolete-variable 'executable-self-display nil "25.1" 'set)
+
 
 (defvar executable-font-lock-keywords
   '(("\\`#!.*/\\([^ \t\n]+\\)" 1 font-lock-keyword-face t))
@@ -251,10 +253,10 @@ executable."
 
 
 
-;;;###autoload
 (defun executable-self-display ()
   "Turn a text file into a self-displaying Un*x command.
 The magic number of such a command displays all lines but itself."
+  (declare (obsolete nil "25.1"))
   (interactive)
   (if (eq this-command 'executable-self-display)
       (setq this-command 'executable-set-magic))