diff --git a/build.xcvb b/build.xcvb
new file mode 100644
index 0000000000000000000000000000000000000000..5ae7b480a2abcdd6e70955f30d67250dad6dd631
--- /dev/null
+++ b/build.xcvb
@@ -0,0 +1,9 @@
+#+xcvb
+(module
+ (:fullname
+  "meta"
+  :depends-on
+  ("package" "meta-src")
+  :supersedes-asdf
+  ("meta")))
+
diff --git a/meta-src.lisp b/meta-src.lisp
index a8923535fde94137939b3718aa789b3f42f16ea2..7e05f9ec610310ac1aa720774888e0326a25a858 100644
--- a/meta-src.lisp
+++ b/meta-src.lisp
@@ -47,9 +47,11 @@
 ;;;;       Proc. 19'th Nat'l. Conf. of the ACM (Aug. 1964),D1.3-1-D1.3-11.
 ;;;;
 ;;;;
-;;;; Nürnberg, 01.Jul.2001 Jochen Schmidt
+;;;; Nuernberg, 01.Jul.2001 Jochen Schmidt
 
 
+#+xcvb (module (:depends-on ("package")))
+
 (in-package :meta)
 
 
@@ -143,7 +145,7 @@
                          ))))
 
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (defparameter *saved-readtable* (copy-readtable))
 (defparameter *meta-readtable* (copy-readtable))
 
@@ -202,7 +204,7 @@
 
 #|
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (deftype digit () '(member #\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9))
 
   (deftype non-digit () '(not (member #\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)))
@@ -210,7 +212,7 @@
   (defun ctoi (d) (- (char-code d) #.(char-code #\0)))
 )
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (enable-meta-syntax)
 )
 
@@ -224,7 +226,7 @@
                             $[@(digit d) !(setq n (+ (* n 10) (ctoi d)))]])
                      (* s n))))
 
-(eval-when (compile load eval)
+(eval-when (:compile-toplevel :load-toplevel :execute)
 (disable-meta-syntax)
 )
 
diff --git a/package.lisp b/package.lisp
index 9845cf00402b38bd711fe87e10bd00628007edf2..f7350856f0cea3768cc3e1c90b5b0143ddbfa692 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,5 +1,7 @@
 ;;;; See meta.lisp for copyright-information
 
+#+xcvb (module (:depends-on nil))
+
 (in-package :cl-user)
 
 (defpackage :meta