diff --git a/README b/README
index fb627ca1..20d5aabb 100644
--- a/README
+++ b/README
@@ -2,8 +2,9 @@ This is the README for the source archive of PuTTY, a free Win32
 and Unix Telnet and SSH client.
 
 If you want to rebuild PuTTY from source, we provide a variety of
-Makefiles and equivalents. (If you have fetched the source from CVS,
-you'll have to generate the Makefiles yourself -- see below.)
+Makefiles and equivalents. (If you have fetched the source from
+Subversion, you'll have to generate the Makefiles yourself -- see
+below.)
 
 For building on Windows:
 
diff --git a/doc/faq.but b/doc/faq.but
index 6a3b3ce8..bafd9a00 100644
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -1,4 +1,4 @@
-\versionid $Id: faq.but,v 1.83 2004/11/15 15:57:28 jacob Exp $
+\versionid $Id$
 
 \A{faq} PuTTY FAQ
 
@@ -158,7 +158,7 @@ completely is the wrong solution and we will not do it.
 
 If you have host keys available in the common \c{known_hosts} format,
 we have a script called 
-\W{http://cvs.tartarus.org/putty/contrib/kh2reg.py}\c{kh2reg.py}
+\W{http://www.tartarus.org/~simon-anonsvn/viewcvs.cgi/putty/contrib/kh2reg.py?view=markup}\c{kh2reg.py}
 to convert them to a Windows .REG file, which can be installed ahead of
 time by double-clicking or using \c{REGEDIT}.
 
diff --git a/mksrcarc.sh b/mksrcarc.sh
index e955d33c..8295aea7 100755
--- a/mksrcarc.sh
+++ b/mksrcarc.sh
@@ -2,6 +2,7 @@
 perl mkfiles.pl
 text=`{ find . -name CVS -prune -o \
                -name .cvsignore -prune -o \
+               -name .svn -prune -o \
                -name LATEST.VER -prune -o \
                -name CHECKLST.txt -prune -o \
                -name mksrcarc.sh -prune -o \
diff --git a/mkunxarc.sh b/mkunxarc.sh
index a2907954..bde24405 100755
--- a/mkunxarc.sh
+++ b/mkunxarc.sh
@@ -35,6 +35,7 @@ find . -name uxarc -prune -o -name . -o \
 find . -name uxarc -prune -o \
        -name CVS -prune -o \
        -name .cvsignore -prune -o \
+       -name .svn -prune -o \
        -name '*.zip' -prune -o \
        -name '*.tar.gz' -prune -o \
        -type f -exec ln -s $PWD/{} uxarc/$arcname/{} \;