diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e31030d63..ee5ab5d11 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -619,7 +619,6 @@ configFiles(XF86ConfFilesPtr fileconf)
 }
 
 typedef enum {
-    FLAG_NOTRAPSIGNALS,
     FLAG_DONTVTSWITCH,
     FLAG_DONTZAP,
     FLAG_DONTZOOM,
@@ -653,8 +652,6 @@ typedef enum {
  * if the parser found the option in the config file.
  */
 static OptionInfoRec FlagOptions[] = {
-    {FLAG_NOTRAPSIGNALS, "NoTrapSignals", OPTV_BOOLEAN,
-     {0}, FALSE},
     {FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
      {0}, FALSE},
     {FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
@@ -737,7 +734,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
     xf86ProcessOptions(-1, optp, FlagOptions);
 
-    xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
     xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
     xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
     xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index e08aa5bf1..193f17aec 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -108,7 +108,6 @@ xf86InfoRec xf86Info = {
     .ShareVTs = FALSE,
     .dontZap = FALSE,
     .dontZoom = FALSE,
-    .notrapSignals = FALSE,
     .currentScreen = NULL,
 #ifdef CSRG_BASED
     .consType = -1,
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0a5af8272..8f50580fe 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -232,24 +232,6 @@ xf86PrivsElevated(void)
     return PrivsElevated();
 }
 
-static void
-TrapSignals(void)
-{
-    if (xf86Info.notrapSignals) {
-        OsSignal(SIGSEGV, SIG_DFL);
-        OsSignal(SIGABRT, SIG_DFL);
-        OsSignal(SIGILL, SIG_DFL);
-#ifdef SIGEMT
-        OsSignal(SIGEMT, SIG_DFL);
-#endif
-        OsSignal(SIGFPE, SIG_DFL);
-        OsSignal(SIGBUS, SIG_DFL);
-        OsSignal(SIGSYS, SIG_DFL);
-        OsSignal(SIGXCPU, SIG_DFL);
-        OsSignal(SIGXFSZ, SIG_DFL);
-    }
-}
-
 static void
 AddSeatId(CallbackListPtr *pcbl, void *data, void *screen)
 {
@@ -356,8 +338,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
             }
         }
 
-        TrapSignals();
-
         /* Initialise the loader */
         LoaderInit();
 
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 21c2e1fe4..55d1b2455 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -63,7 +63,6 @@ typedef struct {
     Bool ShareVTs;
     Bool dontZap;
     Bool dontZoom;
-    Bool notrapSignals;         /* don't exit cleanly - die at fault */
 
     /* graphics part */
     ScreenPtr currentScreen;
diff --git a/hw/xfree86/doc/Registry b/hw/xfree86/doc/Registry
index ad5b9bffb..9c6b11473 100644
--- a/hw/xfree86/doc/Registry
+++ b/hw/xfree86/doc/Registry
@@ -216,7 +216,6 @@ DisableVidModeExtension   B     F    disable VidMode extension
 DontVTSwitch              B     F    disable Ctrl-Alt-Fn
 DontZap                   B     F    disable Ctrl-Alt-BS sequence
 DontZoom                  B     F    disable Ctrl-Alt-+/-
-NoTrapSignals             B     F    don't trap signals
 OffTime                   I     F    Time before DPMS off mode active (min)
 PciProbe1                 O     F    use PCI probe algorithm 1
 PciProbe2                 O     F    use PCI probe algorithm 2
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 958926243..2c18252b7 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -509,15 +509,6 @@ section to use in the absence of the
 .B \-layout
 command line option.
 .TP 7
-.BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
-This prevents the Xorg server from trapping a range of unexpected fatal
-signals and exiting cleanly.
-Instead, the Xorg server will die and drop core where the fault occurred.
-The default behaviour is for the Xorg server to exit cleanly, but still drop a
-core file.
-In general you never want to use this option unless you are debugging an Xorg
-server problem and know how to deal with the consequences.
-.TP 7
 .BI "Option \*qDontVTSwitch\*q  \*q" boolean \*q
 This disallows the use of the
 .BI Ctrl+Alt+F n
diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c
index 0f69734ba..d677cf1db 100644
--- a/hw/xfree86/parser/Flags.c
+++ b/hw/xfree86/parser/Flags.c
@@ -65,7 +65,6 @@
 
 static const xf86ConfigSymTabRec ServerFlagsTab[] = {
     {ENDSECTION, "endsection"},
-    {NOTRAPSIGNALS, "notrapsignals"},
     {DONTZAP, "dontzap"},
     {DONTZOOM, "dontzoom"},
     {DISABLEVIDMODE, "disablevidmodeextension"},
@@ -111,7 +110,6 @@ xf86parseFlagsSection(void)
         case SUSPENDTIME:
         case OFFTIME:
             hasvalue = TRUE;
-        case NOTRAPSIGNALS:
         case DONTZAP:
         case DONTZOOM:
         case DISABLEVIDMODE:
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 15792c618..4abff0d79 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -103,7 +103,6 @@ typedef enum {
     XKBDIR,
 
     /* Server Flag tokens.  These are deprecated in favour of generic Options */
-    NOTRAPSIGNALS,
     DONTZAP,
     DONTZOOM,
     DISABLEVIDMODE,
diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp
index a903438b6..8352dcad2 100644
--- a/hw/xfree86/xorgconf.cpp
+++ b/hw/xfree86/xorgconf.cpp
@@ -82,12 +82,6 @@ EndSection
 
 Section "ServerFlags"
 
-# Uncomment this to cause a core dump at the spot where a signal is
-# received.  This may leave the console in an unusable state, but may
-# provide a better stack trace in the core dump to aid in debugging
-
-#    Option	"NoTrapSignals"
-
 # Uncomment this to disable the <Ctrl><Alt><Fn> VT switch sequence
 # (where n is 1 through 12).  This allows clients to receive these key
 # events.