diff --git a/clx/build-clx.lisp b/clx/build-clx.lisp
index 4e7b7258a60daf57b826ec148a46e8a8f1211f96..09673145192b43fad394b5ece2fe675d61e087f7 100644
--- a/clx/build-clx.lisp
+++ b/clx/build-clx.lisp
@@ -1,7 +1,7 @@
 ;;; -*- Mode: Lisp; Package: Xlib; Log: clx.log -*-
 
 ;;; Load this file if you want to compile CLX in its entirety.
-
+#+nil
 (proclaim '(optimize (speed 3) (safety 0) (space 1)
 		     (compilation-speed 0)))
 
@@ -19,7 +19,7 @@
 
 ;(make-package "XLIB" :use '("LISP"))
 
+(compile-file "clx:defsystem.lisp" :error-file nil :load t)
 
-(compile-file "clx:defsystem.lisp" :error-file nil)
-(load "clx:defsystem.fasl")
-(xlib:compile-clx (pathname "clx:"))
+(with-compilation-unit ()
+  (xlib:compile-clx (pathname "clx:")))