diff --git a/code/debug.lisp b/code/debug.lisp
index 50d71b7fbf0f264967b8f41b2fa6fecf0a77176d..8cde4b73b384404bc2f1da8488bcf60f657a2ad0 100644
--- a/code/debug.lisp
+++ b/code/debug.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.51 2001/01/28 12:54:08 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug.lisp,v 1.52 2001/02/22 20:28:51 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -716,6 +716,9 @@ See the CMU Common Lisp User's Manual for more information.
   "When non-NIL, becomes the system *READTABLE* in the debugger
    read-eval-print loop")
 
+(defvar *debug-print-current-frame* t
+  "When non-NIL, print the current frame when entering the debugger.")
+
 (defun maybe-handle-dead-input-stream (condition)
   ;; Scenario: "xon <remote-box> cmucl -edit"
   ;; Then close the display with the window manager or shutdown the
@@ -748,8 +751,9 @@ See the CMU Common Lisp User's Manual for more information.
     (handler-bind ((di:debug-condition #'(lambda (condition)
 					   (princ condition *debug-io*)
 					   (throw 'debug-loop-catcher nil))))
-      (fresh-line)
-      (print-frame-call *current-frame* :verbosity 2)
+      (when *debug-print-current-frame*
+        (fresh-line)
+        (print-frame-call *current-frame* :verbosity 2))
       (loop
 	(catch 'debug-loop-catcher
 	  (handler-bind ((error #'(lambda (condition)
diff --git a/code/fdefinition.lisp b/code/fdefinition.lisp
index 4c84ee21ae1e3994680f057adb70fd6eb6786d3c..1a9d6d0c3ea8fef4d0a84af2928c05798fbf9208 100644
--- a/code/fdefinition.lisp
+++ b/code/fdefinition.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fdefinition.lisp,v 1.17 1998/07/16 13:30:47 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fdefinition.lisp,v 1.18 2001/02/22 20:28:52 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -81,7 +81,7 @@
 ;;;
 (defun fdefinition-object (name create)
   "Return the fdefn object for NAME.  If it doesn't already exist and CREATE
-   it non-NIL, create a new (unbound) one."
+   is non-NIL, create a new (unbound) one."
   (declare (values (or fdefn null)))
   (unless (or (symbolp name)
 	      (and (consp name)
diff --git a/code/internet.lisp b/code/internet.lisp
index 0a4367104b90647321e9384a1fae2a76bb36571b..f01115f801cd1fe66f1e178f29c7dc9361e9b00f 100644
--- a/code/internet.lisp
+++ b/code/internet.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.27 2000/11/06 13:02:23 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.28 2001/02/22 20:28:52 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -74,7 +74,7 @@
 
 (defun internet-protocol (kind)
   (when (eq kind :data-gram) ; Sep-2000. Remove someday.
-    (warn "Internet protocol :DATA-GRAM is depreciated. Using :DATAGRAM")
+    (warn "Internet protocol :DATA-GRAM is deprecated. Using :DATAGRAM")
     (setq kind :datagram))
   (let ((entry (assoc kind *internet-protocols*)))
     (unless entry
@@ -340,6 +340,7 @@ struct in_addr {
 
 (defun accept-tcp-connection (unconnected)
   (declare (fixnum unconnected))
+  #+MP (mp:process-wait-until-fd-usable unconnected :input)
   (with-alien ((sockaddr inet-sockaddr))
     (let ((connected (unix:unix-accept unconnected
 				       (alien-sap sockaddr)
diff --git a/code/tty-inspect.lisp b/code/tty-inspect.lisp
index 8aa6d143d7b64e48758779012e6d7be65a73c552..6ed5695d6803053a8ac3974e6148a0b0fd9383a0 100644
--- a/code/tty-inspect.lisp
+++ b/code/tty-inspect.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/tty-inspect.lisp,v 1.17 2000/04/02 20:25:32 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/tty-inspect.lisp,v 1.18 2001/02/22 20:28:52 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -110,7 +110,7 @@
 (defun do-tty-inspect-eval (command stream)
   (let ((result-list (restart-case (multiple-value-list (eval command))
 		       (nil () :report "Return to the TTY-INSPECTOR"
-			  (format stream "~%Returning to INPSECTOR.~%")
+			  (format stream "~%Returning to INSPECTOR.~%")
 			  (return-from do-tty-inspect-eval nil)))))
     (setf /// // // / / result-list)
     (setf +++ ++ ++ + + - - command)
diff --git a/interface/interface.lisp b/interface/interface.lisp
index 5765c81ab499fb6a0f78e94742e1924487f79a8a..7b08772043aa592eb66578fd3a69cb528563010d 100644
--- a/interface/interface.lisp
+++ b/interface/interface.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/interface/interface.lisp,v 1.10 1996/05/08 10:43:56 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/interface/interface.lisp,v 1.11 2001/02/22 20:28:53 pw Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -773,7 +773,7 @@
 	     (ext:process-alive-p xt::*local-motif-server*))
     (ext:process-kill xt::*local-motif-server* :sigint)))
 
-(in-package "LISP")
+(in-package "EXT")
 
 (defun quit (&optional recklessly-p)
   "Terminates the current Lisp.  Things are cleaned up unless Recklessly-P is
@@ -782,4 +782,4 @@
       (unix:unix-exit 0)
       (progn
 	(interface::cleanup-motif)
-	(throw '%end-of-the-world 0))))
+	(throw 'cl::%end-of-the-world 0))))
diff --git a/lisp/lisp.c b/lisp/lisp.c
index 6efb0d40b069ee3178d1599d8497daeaa528b3e5..c70c03ef47782ed3776645435d14deea3a9578e2 100644
--- a/lisp/lisp.c
+++ b/lisp/lisp.c
@@ -1,7 +1,7 @@
 /*
  * main() entry point for a stand alone lisp image.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.22 2000/10/27 19:25:55 dtc Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/lisp.c,v 1.23 2001/02/22 20:28:54 pw Exp $
  *
  */
 
@@ -85,7 +85,7 @@ static lispobj alloc_str_list(char *list[])
 
 /* And here be main. */
 
-void main(int argc, char *argv[], char *envp[])
+int main(int argc, char *argv[], char *envp[])
 {
     char *arg, **argptr;
     char *core = NULL, *default_core;
diff --git a/motif/server/Config.x86 b/motif/server/Config.x86
index 31033ee41f6179ce48e9436ec987c3e437f064f6..6c2c9238abecf5d4680871a4f85cf51036d4987c 100644
--- a/motif/server/Config.x86
+++ b/motif/server/Config.x86
@@ -1,6 +1,6 @@
 CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH)
 LDFLAGS = -L/usr/X11R6/lib
-LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE
+LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp
 # This def assumes you are building in the same or parallel
 # tree to the CVS souce layout. Sites may need to customize
 # this path.
diff --git a/motif/server/timer-support.c b/motif/server/timer-support.c
index 7c7f2fb213ec6030df315d9d00e5fb3f0017f1ea..ef266977b68e9ef9631cff501be191a579a1a8e3 100644
--- a/motif/server/timer-support.c
+++ b/motif/server/timer-support.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C -*- */
 
-/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/timer-support.c,v 1.2 1994/10/29 03:00:32 ram Exp $ */
+/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/motif/server/timer-support.c,v 1.3 2001/02/22 20:28:55 pw Rel $ */
 
 /* timer_support.c --
  * Extension to CMUCL Motif Interface. Adding missing call for
@@ -61,7 +61,7 @@ RawTimerHandler(XtPointer lisp_timer_id, XtIntervalId* timer) {
   message_add_packet(reply);
   message_put_dblword(reply, TIMEOUT_REPLY); /* This is new. */
   message_write_int(reply, (unsigned long) *lisp_timer_id);
-  message_write_int(reply, (unsgined long) *timer);
+  message_write_int(reply, (unsigned long) *timer);
   message_send(client_socket, reply);
   message_free(reply);