diff --git a/ChangeLog b/ChangeLog
index 97b8bb5..3f46832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5209,3 +5209,9 @@ As requested by Ben Armstrong <synrg@sanctuary.nslug.ns.ca>, saving
 theme settings will not preserve -e/--exec arguments unless a theme
 was specifically named by the user.
 ----------------------------------------------------------------------
+Tue Apr 20 15:40:39 2004                        Michael Jennings (mej)
+
+Enable title-reporting and iconname-reporting escape sequences only if
+specifically requested by user at compile time.  This exists solely to
+protect the ignorant and careless from themselves.
+----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index cfdaa82..365ea51 100644
--- a/configure.in
+++ b/configure.in
@@ -916,6 +916,17 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl# Enable/disable name reporting escape sequences
+AC_MSG_CHECKING(if we should enable name reporting escape sequences)
+AC_ARG_ENABLE(name-eporting-escapes, [  --enable-name-reporting-escapes  Specify this to enable title/icon name reporting], [
+              if test "$enableval" = "yes"; then
+                  AC_MSG_RESULT(yes)
+                  AC_DEFINE(ENABLE_NAME_REPORTING_ESCAPES, 1, [Defined to enable title/icon name reporting escape sequences.])
+              else
+                  AC_MSG_RESULT(no)
+              fi
+], [AC_MSG_RESULT(no)])
+
 dnl# Enable/disable humor
 AC_ARG_WITH(sense-of-humor, [  --without-sense-of-humor   Specify this if you have no sense of humor], [
             if test "$withval" = "no"; then
diff --git a/src/term.c b/src/term.c
index 85ba3f7..3b89bc1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1398,6 +1398,7 @@ process_window_mode(unsigned int nargs, int args[])
               snprintf(buff, sizeof(buff), "\033[8;%d;%dt", TERM_WINDOW_GET_REPORTED_ROWS(), TERM_WINDOW_GET_REPORTED_COLS());
               tt_write((unsigned char *) buff, strlen(buff));
               break;
+#ifdef ENABLE_NAME_REPORTING_ESCAPES
           case 20:
               XGetIconName(Xdisplay, TermWin.parent, &name);
               snprintf(buff, sizeof(buff), "\033]L%s\033\\", name);
@@ -1410,6 +1411,7 @@ process_window_mode(unsigned int nargs, int args[])
               tt_write((unsigned char *) buff, strlen(buff));
               XFree(name);
               break;
+#endif
           default:
               break;
         }