diff --git a/base64.asd b/cl-base64.asd
similarity index 61%
rename from base64.asd
rename to cl-base64.asd
index f50650b7c27fcf3876a906113f62966e132fec91..219ddd52ecd2d8359a19e4478f3a5f19078a96f5 100644
--- a/base64.asd
+++ b/cl-base64.asd
@@ -2,8 +2,8 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          base64.asd
-;;;; Purpose:       ASDF definition file for Base64
+;;;; Name:          cl-base64.asd
+;;;; Purpose:       ASDF definition file for Cl-Base64
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
@@ -11,11 +11,11 @@
 ;;;; *************************************************************************
 
 (in-package #:cl-user)
-(defpackage #:base64-system (:use #:asdf #:cl))
-(in-package #:base64-system)
+(defpackage #:cl-base64-system (:use #:asdf #:cl))
+(in-package #:cl-base64-system)
 
 
-(defsystem base64
+(defsystem cl-base64
   :name "cl-base64"
   :author "Kevin M. Rosenberg based on initial code by Juri Pakaste"
   :version "3.1"
@@ -32,17 +32,17 @@
    (:file "decode" :depends-on ("package"))
    ))
 
-(defmethod perform ((o test-op) (c (eql (find-system 'base64))))
-  (operate 'load-op 'base64-tests)
-  (operate 'test-op 'base64-tests :force t))
+(defmethod perform ((o test-op) (c (eql (find-system 'cl-base64))))
+  (operate 'load-op 'cl-base64-tests)
+  (operate 'test-op 'cl-base64-tests :force t))
 
-(defsystem base64-tests
-    :depends-on (base64 ptester)
+(defsystem cl-base64-tests
+    :depends-on (cl-base64 ptester)
     :components
     ((:file "tests")))
 
-(defmethod perform ((o test-op) (c (eql (find-system 'base64-tests))))
-  (operate 'load-op 'base64-tests)
+(defmethod perform ((o test-op) (c (eql (find-system 'cl-base64-tests))))
+  (operate 'load-op 'cl-base64-tests)
   (or (funcall (intern (symbol-name '#:do-tests)
-		       (find-package 'base64-test)))
+		       (find-package '#:cl-base64-tests)))
       (error "test-op failed")))
diff --git a/debian/changelog b/debian/changelog
index 6f159e12ec9784dc2820d6cf72e3db939b6b7cfa..cec72033b9ae68800b6bd38be88c495930b0aa7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-base64 (3.3.1-1) unstable; urgency=low
+
+  * Rename ASDF system to cl-base64
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 18 Apr 2004 10:39:51 -0600
+
 cl-base64 (3.3-1) unstable; urgency=low
 
   * Rework test loading
diff --git a/debian/control b/debian/control
index 53e69a5d1e9a8f7945f811a40bea73331f9f659b..a68f0545c5723175d85e9e34c164c867f14610a8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.5.10.0
+Standards-Version: 3.6.1.0
 
 Package: cl-base64
 Architecture: all
diff --git a/tests.lisp b/tests.lisp
index 9c0d4f53778fd14d41036fe305c25377e15cf144..e0802404aa61824f5243c07354f97e19b144fda1 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -12,10 +12,10 @@
 
 (in-package #:cl-user)
 
-(defpackage #:base64-test
-  (:use #:cl #:kmrcl #:base64 #:ptester))
+(defpackage #:base64-tests
+  (:use #:cl #:kmrcl #:cl-base64 #:ptester))
 
-(in-package #:base64-test)
+(in-package #:cl-base64-test)
 
 (defun do-tests ()
   (with-tests (:name "cl-base64 tests")