diff --git a/code/signal.lisp b/code/signal.lisp
index ef6900176360f6c6674edf782c521629dada68f2..a21be2e5f50d4c970886efdaafefc74b0b54ab03 100644
--- a/code/signal.lisp
+++ b/code/signal.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.8 1990/11/16 04:35:34 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/signal.lisp,v 1.9 1990/11/26 15:54:58 wlott Exp $
 ;;;
 ;;; Code for handling UNIX signals.
 ;;; 
@@ -231,6 +231,7 @@
 
 (define-signal-handler sigint-handler "Interrupted" break)
 (define-signal-handler sigill-handler "Illegal Instruction")
+(define-signal-handler sigtrap-handler "SIGTRAP")
 (define-signal-handler sigiot-handler "SIGIOT")
 (define-signal-handler sigemt-handler "SIGEMT")
 (define-signal-handler sigbus-handler "Bus Error")
@@ -248,8 +249,12 @@
   (unless (member "-monitor" lisp::lisp-command-line-list :test #'string=)
     (enable-interrupt :sigint #'sigint-handler))
   (enable-interrupt :sigquit #'sigquit-handler)
-  (enable-interrupt :sigill #'sigill-handler)
-  (enable-interrupt :sigtrap #'kernel::internal-error)
+  (enable-interrupt :sigill
+		    #+sparc #'kernel::internal-error
+		    #-sparc #'sigill-handler)
+  (enable-interrupt :sigtrap
+		    #+pmax #'kernel::internal-error
+		    #-pmax #'sigtrap-handler)
   (enable-interrupt :sigiot #'sigiot-handler)
   (enable-interrupt :sigemt #'sigemt-handler)
   (enable-interrupt :sigfpe #'vm:sigfpe-handler)