diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index 3b4e200cb6c2710f20ddb8e3fec72116977c2faa..a94c18779aa1e07444e304a3d4ad36d580c9e3fe 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -3,7 +3,7 @@ CHANGELOG for smartmontools
 $Id$
 
 The most recent version of this file is:
-http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
+http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/CHANGELOG?view=markup
 
 Maintainers / Developers Key (alphabetic order):
 [BA]  Bruce Allen
@@ -42,6 +42,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Update documentation files for SVN.
+
   [CF] Rename trunk/sm5 to trunk/smartmontools.
 
   [CF] Print SVN revision number instead of time in version info line.
diff --git a/smartmontools/INSTALL b/smartmontools/INSTALL
index 5f3597d5d5f25d56beec34bc809873e803db0c01..d3f5fae911049a6d7da74fa97ad004970cb4d442 100644
--- a/smartmontools/INSTALL
+++ b/smartmontools/INSTALL
@@ -9,7 +9,7 @@ http://smartmontools.sourceforge.net/
 Table of contents:
 
 [1] System requirements
-[2] Installing from CVS
+[2] Installing from SVN
 [3] Installing from source tarball
 [4] Guidelines for different Linux distributions
 [5] Guidelines for FreeBSD
@@ -209,23 +209,19 @@ Table of contents:
     Innotek LibC 0.5 runtime is required.
     Currently only ATA disks are supported, SCSI support will be added.
 
-
-[2] Installing from CVS
+[2] Installing from SVN
 =======================
-    Get the sources from the CVS repository:
-    cvs -d :pserver:anonymous@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools login
-    cvs -d :pserver:anonymous@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools co sm5
-    (when prompted for a password, just press Enter)
+
+    Get the sources from the SVN repository:
+    svn co https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools smartmontools
 
     Then type:
     ./autogen.sh
     and continue with step [3] below, skipping the "unpack the tarball" step.
 
-    Further details of using CVS can be found at the URL above.
-
     The autogen.sh command is ONLY required when installing from
-    CVS. You need GNU Autoconf (version 2.50 or greater), GNU Automake
-    (version 1.6 or greater) and their dependencies installed in order
+    SVN. You need GNU Autoconf (version 2.50 or greater), GNU Automake
+    (version 1.7 or greater) and their dependencies installed in order
     to run it.  You can get these here:
     http://www.gnu.org/directory/GNU/autoconf.html
     http://www.gnu.org/directory/GNU/automake.html
@@ -233,7 +229,7 @@ Table of contents:
 [3] Installing from the source tarball
 ======================================
 
-    If you are NOT installing from CVS, then unpack the tarball: 
+    If you are NOT installing from SVN, then unpack the tarball:
     tar zxvf smartmontools-5.VERSION.tar.gz
 
     Then:
@@ -428,7 +424,7 @@ Same as Red Hat:
   file type ("binmode" mount option) set. The "autogen.sh" script prints a
   warning if DOS type is selected.
 
-  If installing from CVS, you may check out all files either with CR/LF
+  If installing from SVN, you may check out all files either with CR/LF
   or LF line endings. Starting with release 3.1-7, Cygwin's bash does no
   longer accept scripts with CR/LF by default. To run the initial script
   ./autogen.sh checked out with CR/LF on a "binmode" mount, type:
@@ -493,7 +489,7 @@ To prepare os_win32 directory for MSVC8, use the following on Cygwin:
   make config-vc8
 
   The MSVC8 project files (os_win32/smartmontools_vc8.sln,
-  os_win32/smart{ctl,d}_vc8.vcproj) are included in CVS (but not in
+  os_win32/smart{ctl,d}_vc8.vcproj) are included in SVN (but not in
   source tarball). The target config-vc8 from a Makefile configured
   for MinGW creates os_win32/{config,svnversion}_vc8.h from
   ./{config,svnversion}.h. The configure skript must be run outside
@@ -589,7 +585,7 @@ The following files are installed if ./configure has no options:
 /usr/local/share/man/man8/smartctl.8                    [Manual page]
 /usr/local/share/man/man8/smartd.8                      [Manual page]
 /usr/local/share/doc/smartmontools-5.X/AUTHORS          [Information about the authors and developers]
-/usr/local/share/doc/smartmontools-5.X/CHANGELOG        [A log of changes. Also see CVS]
+/usr/local/share/doc/smartmontools-5.X/CHANGELOG        [A log of changes. Also see SVN]
 /usr/local/share/doc/smartmontools-5.X/COPYING          [GNU General Public License Version 2]
 /usr/local/share/doc/smartmontools-5.X/INSTALL          [Installation instructions: what you're reading!]
 /usr/local/share/doc/smartmontools-5.X/NEWS             [Significant bugs discovered in old versions]
diff --git a/smartmontools/NEWS b/smartmontools/NEWS
index 70be1fa2842b1de54eb4b3b8181de40a76be9028..fecadd2d8879a20a4844d58cac7d93de8ab4b57b 100644
--- a/smartmontools/NEWS
+++ b/smartmontools/NEWS
@@ -1,13 +1,14 @@
 smartmontools NEWS
 ------------------
-CVS ID: $Id: NEWS,v 1.38 2009/07/06 02:46:47 geoffk1 Exp $
+$Id$
 
 The most up-to-date version of this file is:
-http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/NEWS?view=markup
+http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/NEWS?view=markup
 
-Date <Not released yet, please try current CVS>
+Date <Not released yet, please try current SVN>
 Summary: smartmontools release 5.39 (UNSTABLE/EXPERIMENTAL)
 -----------------------------------------------------------
+- Sourcecode repository moved from CVS to SVN
 - Support for USB devices with Cypress, JMicron and Sunplus USB bridges
 - USB device type autodetection for some devices on Linux and Windows
   (http://smartmontools.wiki.sourceforge.net/overview_USB-Support)
@@ -39,7 +40,7 @@ Summary: smartmontools release 5.39 (UNSTABLE/EXPERIMENTAL)
 - Change to an object oriented interface to access ATA and SCSI devices
 - Linux and Win32 modules migrated to new interface
 - Rework of smartd data structures
-- CVS checkin date/time and optional BUILD_INFO printed in version info
+- Checkin date and SVN revision and optional BUILD_INFO printed in version info
 - Better support for gSmartControl on Windows
 - SELinux fixes to 3ware device node creation
 - Fix CCISS file descriptor leak on FreeBSD
@@ -82,7 +83,7 @@ below, it includes:
  - Additional command line options for selective self-tests
  - Compilation fixes for various platforms.
 
-See CHANGELOG for more details, or smartmontools CVS for still further
+See CHANGELOG for more details, or smartmontools SVN for still further
 details.
 
 Date 2006-12-20
diff --git a/smartmontools/README b/smartmontools/README
index 646fc707f1f34d55e7ef198727df7afd0a882d07..cee75003c4b70f4bcbaeb7207919e60f16135d4d 100644
--- a/smartmontools/README
+++ b/smartmontools/README
@@ -3,7 +3,7 @@ smartmontools - S.M.A.R.T. utility toolset for Darwin/Mac
 OSX, FreeBSD, Linux, NetBSD, OpenBSD, Solaris, and Windows.
 ==========================================================
 
-$Id: README,v 1.57 2008/03/04 22:09:47 ballen4705 Exp $
+$Id$
 
 == HOME ==
 The home for smartmontools is located at:
@@ -19,7 +19,7 @@ You will find a mailing list for support and other questions at:
 
 
 == COPYING ==
-Copyright (C) 2002-8 Bruce Allen <smartmontools-support@lists.sourceforge.net>
+Copyright (C) 2002-9 Bruce Allen <smartmontools-support@lists.sourceforge.net>
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
@@ -71,32 +71,19 @@ Source tarballs
 
 http://sourceforge.net/project/showfiles.php?group_id=64297
 
-CVS
+SVN
 ---
 
-cvs -d:pserver:anonymous@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools login (when prompted for a password, just press Enter)
-cvs -d:pserver:anonymous@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools co sm5
+svn co https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk/smartmontools smartmontools
 
-This will create a subdirectory called sm5/ containing the code.
+This will create a subdirectory called smartmontools containing the code.
 
-To instead get the 5.1-16 release:
+To instead get the 5.38 release:
 
-cvs -d:pserver:anonymous@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools co -r RELEASE_5_1_16 sm5
-
-To update your sources to the 5.1-18 release:
-
-cd sm5
-cvs up -r RELEASE_5_1_18
-
-To update any tagged release to the latest development code:
-
-cd sm5
-cvs up -A
+svn co https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/tags/RELEASE_5_38/sm5 smartmontools
 
 You can see what the different tags are by looking at
-http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/ .
-You'll see the tag names in the little scroll window where it says "Show
-only files with tag".
+http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/tags/
 
 == BUILDING/INSTALLING SMARTMONTOOLS ==
 
diff --git a/smartmontools/WARNINGS b/smartmontools/WARNINGS
index 6398a30be25f06279578d223b99295c82fe0cc4a..a69536679255540a3f946ae73cac64ff035023a2 100644
--- a/smartmontools/WARNINGS
+++ b/smartmontools/WARNINGS
@@ -1,7 +1,7 @@
-$Id: WARNINGS,v 1.34 2009/06/18 17:24:51 chrfranke Exp $
+$Id$
 
 The most recent version of this file can be found here:
-http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/WARNINGS?view=markup
+http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/WARNINGS?view=markup
 
 The following are reports of serious problems (eg system lockup) which
 were due to smartmontools.  There are DARWIN, LINUX, FREEBSD, SOLARIS
diff --git a/smartmontools/autogen.sh b/smartmontools/autogen.sh
index 7f43385a4eadbaf2221de3237070e04eb7de4082..5e171e792938f11ed66b2f4b7ebcaa823cc990b7 100755
--- a/smartmontools/autogen.sh
+++ b/smartmontools/autogen.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.21 2009/06/20 19:51:42 chrfranke Exp $
+# $Id$
 #
 # Generate ./configure from config.in and Makefile.in from Makefile.am.
 # This also adds files like missing,depcomp,install-sh to the source
@@ -38,7 +38,7 @@ test -x "$AUTOMAKE" || AUTOMAKE=`typep automake-1.11` || AUTOMAKE=`typep automak
 {
 echo
 echo "You must have at least GNU Automake 1.7 (up to 1.11) installed"
-echo "in order to bootstrap smartmontools from CVS. Download the"
+echo "in order to bootstrap smartmontools from SVN. Download the"
 echo "appropriate package for your distribution, or the source tarball"
 echo "from ftp://ftp.gnu.org/gnu/automake/ ."
 echo