diff --git a/ChangeLog b/ChangeLog
index 63531c5943..7397335533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-07  Alexandre Oliva <oliva@gnu.org>
+
+	Revert:
+	2018-04-30  Raymond Nicholson <rain1@airmail.cc>
+	* manual/startup.texi (Aborting a Program): Remove inappropriate joke.
+
 2018-05-05  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	[BZ #20419]
diff --git a/manual/startup.texi b/manual/startup.texi
index 21c48cd037..7395d32dd0 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -1005,6 +1005,14 @@ This function actually terminates the process by raising a
 intercept this signal; see @ref{Signal Handling}.
 @end deftypefun
 
+@c Put in by rms.  Don't remove.
+@cartouche
+@strong{Future Change Warning:} Proposed Federal censorship regulations
+may prohibit us from giving you information about the possibility of
+calling this function.  We would be required to say that this is not an
+acceptable way of terminating a program.
+@end cartouche
+
 @node Termination Internals
 @subsection Termination Internals