diff --git a/collects/help/servlets/private/util.ss b/collects/help/servlets/private/util.ss
index c8a1cd8276..96000a73b7 100644
--- a/collects/help/servlets/private/util.ss
+++ b/collects/help/servlets/private/util.ss
@@ -35,7 +35,7 @@
            (with-handlers ([exn:fail:filesystem? (lambda (exn) #f)])
              (collection-path "repos-time-stamp"))])
       (if (and stamp-collection (file-exists? (build-path stamp-collection "stamp.ss")))
-          (format "~a-cvs~a" mz-version (dynamic-require '(lib "stamp.ss" "repos-time-stamp") 'stamp))
+          (format "~a-svn~a" mz-version (dynamic-require '(lib "stamp.ss" "repos-time-stamp") 'stamp))
           mz-version)))
   
   
diff --git a/collects/htdp/Test/TODO b/collects/htdp/Test/TODO
index 5285f9e4d1..8838db08f2 100644
--- a/collects/htdp/Test/TODO
+++ b/collects/htdp/Test/TODO
@@ -1,6 +1,6 @@
 teachpack/htdp
 collects/htdp
- cvs commit -m. 
+ svn commit -m ""
 
 -----------------------------------------------------------------------------------
 
diff --git a/collects/htdp/master.ss b/collects/htdp/master.ss
index 1f0c7010a2..e1e433920d 100644
--- a/collects/htdp/master.ss
+++ b/collects/htdp/master.ss
@@ -37,11 +37,10 @@
   #|
   cd ~.../plt/collects/icons 
   cp where/ever/trumpet.xbm .
-  cvs update -A 
-  cvs add -kb trumpet.xbm 
-  cvs commit -m "added trumpet image"
-  cvs tag -F exp trumpet.xbm
-  cvs update -r exp
+  svn update
+  svn trumpet.xbm
+  svn setprop svn:mime-type image/x-xbitmap
+  svn commit -m "added trumpet image"
   |#
   
   #| ------------------------------------------------------------------------
diff --git a/collects/repos-time-stamp/time-stamp.ss b/collects/repos-time-stamp/time-stamp.ss
index 7f1b1c75de..8c80ac1180 100644
--- a/collects/repos-time-stamp/time-stamp.ss
+++ b/collects/repos-time-stamp/time-stamp.ss
@@ -15,4 +15,4 @@
       (import drscheme:tool^)
       (define (phase1) (void))
       (define (phase2) (void))
-      (version:add-spec '-cvs stamp))))
\ No newline at end of file
+      (version:add-spec '-svn stamp))))
diff --git a/collects/string-constants/english-string-constants.ss b/collects/string-constants/english-string-constants.ss
index 5adde991e6..742859a01b 100644
--- a/collects/string-constants/english-string-constants.ss
+++ b/collects/string-constants/english-string-constants.ss
@@ -36,7 +36,7 @@ please adhere to these guidelines:
   has changed and needs to be re-translated.  Do not erase the old
   version, it might help us translate the new one.  Do not move it
   either.  Just comment it out and add the short comment.  After the
-  next cvs update DrScheme will automatically tell us translators that
+  next svn update DrScheme will automatically tell us translators that
   a new string needs to be translated, we will find your comment in
   the file, and know what to do.
 	Some evil evil people might think that, since DrScheme automatically
diff --git a/collects/string-constants/japanese-string-constants.ss b/collects/string-constants/japanese-string-constants.ss
index 1997ec11ba..6840aba4c4 100644
--- a/collects/string-constants/japanese-string-constants.ss
+++ b/collects/string-constants/japanese-string-constants.ss
@@ -36,7 +36,7 @@ please adhere to these guidelines:
   has changed and needs to be re-translated.  Do not erase the old
   version, it might help us translate the new one.  Do not move it
   either.  Just comment it out and add the short comment.  After the
-  next cvs update DrScheme will automatically tell us translators that
+  next svn update DrScheme will automatically tell us translators that
   a new string needs to be translated, we will find your comment in
   the file, and know what to do.
 	Some evil evil people might think that, since DrScheme automatically
diff --git a/collects/version/patchlevel.ss b/collects/version/patchlevel.ss
index c8ea9af2e5..badaeb6d6c 100644
--- a/collects/version/patchlevel.ss
+++ b/collects/version/patchlevel.ss
@@ -1,5 +1,5 @@
 ;; this file contains the current patch level of DrScheme
-;; it is usually `0' in cvs, and changed only when a patch is made.
+;; it is usually `0' in the repository, and changed only when a patch is made.
 (module patchlevel mzscheme
   (define patchlevel 0)
   (provide patchlevel))
diff --git a/src/mzscheme/gc/upgrade.ss b/src/mzscheme/gc/upgrade.ss
index 4bad47d658..09b927fe69 100644
--- a/src/mzscheme/gc/upgrade.ss
+++ b/src/mzscheme/gc/upgrade.ss
@@ -1,7 +1,7 @@
 
 (define old-dir (current-directory))
 (define new-dir "~/tmp/gc6.3")
-(define really-cvs? #t)
+(define really-svn? #t)
 
 (require (lib "file.ss")
 	 (lib "process.ss"))
@@ -66,7 +66,7 @@
 
 (define (go cmd)
   (printf "CMD: ~a~n" cmd)
-  (when really-cvs?
+  (when really-svn?
     (system cmd)))
 
 (hash-table-for-each new 
@@ -82,13 +82,13 @@
   (go (get-output-string s)))
 
 (let ([s (open-output-string)])
-  (fprintf s "cd ~a; cvs add " (path->string old-dir))
+  (fprintf s "cd ~a; svn add " (path->string old-dir))
   (hash-table-for-each new (lambda (k v)
 			     (fprintf s "~a " (path->string k))))
   (go (get-output-string s)))
 
 (let ([s (open-output-string)])
-  (fprintf s "cd ~a; cvs remove " (path->string old-dir))
+  (fprintf s "cd ~a; svn remove " (path->string old-dir))
   (hash-table-for-each old (lambda (k v)
 			     (fprintf s "~a " (path->string k))))
   (go (get-output-string s)))
diff --git a/src/wxcommon/zlib/ChangeLog b/src/wxcommon/zlib/ChangeLog
index 2b0893f1bc..7fb27da842 100644
--- a/src/wxcommon/zlib/ChangeLog
+++ b/src/wxcommon/zlib/ChangeLog
@@ -225,7 +225,7 @@ Changes in 1.0.6 (19 Jan 1998)
 - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
 - added makelcc.bat for lcc-win32 (Tom St Denis)
 - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id: ChangeLog,v 1.1 2003/06/01 21:50:44 mflatt Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- Avoid expanded `Id'. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
 - check for unistd.h in configure (for off_t)
 - remove useless check parameter in inflate_blocks_free
 - avoid useless assignment of s->check to itself in inflate_blocks_new
diff --git a/src/wxxt/src/x/wbuild/src/scan.c b/src/wxxt/src/x/wbuild/src/scan.c
index 000e71b11d..0bb102e918 100644
--- a/src/wxxt/src/x/wbuild/src/scan.c
+++ b/src/wxxt/src/x/wbuild/src/scan.c
@@ -1,7 +1,6 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /proj/scheme/cvs/plt/src/wxxt/src/x/wbuild/src/scan.c,v 1.2 2002/03/01 00:46:49 sowens Exp $
  * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.4 1999/10/27 07:56:44 obrien Exp $
  */
 
@@ -555,7 +554,6 @@ char *yytext;
 **  Author: Bert Bos <bert@let.rug.nl>
 **  Revised by Joel N. Weber II <nemo@nautilus.sub>
 **  Description: (F)LEX definition for Widget Builder
-**  $Header: /proj/scheme/cvs/plt/src/wxxt/src/x/wbuild/src/scan.c,v 1.2 2002/03/01 00:46:49 sowens Exp $
 */
 #line 12 "scan.l"
 #include <config.h>
diff --git a/src/wxxt/src/x/wbuild/src/scan.l b/src/wxxt/src/x/wbuild/src/scan.l
index 341371abb7..b3b865cbbd 100644
--- a/src/wxxt/src/x/wbuild/src/scan.l
+++ b/src/wxxt/src/x/wbuild/src/scan.l
@@ -3,7 +3,6 @@
 **  Author: Bert Bos <bert@let.rug.nl>
 **  Revised by Joel N. Weber II <nemo@nautilus.sub>
 **  Description: (F)LEX definition for Widget Builder
-**  $Header: /proj/scheme/cvs/plt/src/wxxt/src/x/wbuild/src/scan.l,v 1.1 2000/04/05 13:51:42 mflatt Exp $
 */
 
 %k 2000