diff --git a/tools/pclcom.lisp b/tools/pclcom.lisp
index 062efb676ae55fb77c28e73d98a657e0b208d1bb..ad70754a16da4eafd7a14b40f93bc44dee3ad399 100644
--- a/tools/pclcom.lisp
+++ b/tools/pclcom.lisp
@@ -43,7 +43,10 @@
   (let ((class 'pcl::class))
     (rename-package "PCL" "OLD-PCL")
     (make-package "PCL")
-    (shadowing-import class "PCL")))
+    (shadowing-import class "PCL")
+    ;; Move class back to the PCL package so that the respective debug
+    ;; variable has a valid package name.
+    (kernel:%set-symbol-package class (find-package "PCL"))))
 
 (when (find-package  "SLOT-ACCESSOR-NAME")
   (rename-package "SLOT-ACCESSOR-NAME" "OLD-SLOT-ACCESSOR-NAME"))