diff --git a/TODO b/TODO
index a31e5ab1b0aa7b3cb2e10ab690235992a3b252c5..ab71ac518d2c95f8ace55dcb4ab4750676285990 100644
--- a/TODO
+++ b/TODO
@@ -13,8 +13,6 @@ you are working on it!
   want local-to-local, or remote-to-local, or pull backups). This has been
   reported for the duplicity handler as Debian bug #346040.
 
-. Allow vsnames "all" in the msyql handler.
-
 . Factorize the rdiff.helper's connection-related functions into a lib, so
   that they can be used by dup.helper too. (NB: don't forget that the dup
   handler has a sshoptions configuration setting, that is often used to
diff --git a/examples/example.dup b/examples/example.dup
index 7b869d5cb7430a8f73811aac1a2020fe7f27ba07..6977636a636bd36b1f0684fa6183bcb71761f627 100644
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -111,7 +111,7 @@
 [source]
 
 ## A few notes about includes and excludes:
-## 1. include, exclude and vsinclude statements support globbing with '*'
+## 1. include and exclude statements support globbing with '*'
 ## 2. Symlinks are not dereferenced. Moreover, an include line whose path
 ##    contains, at any level, a symlink to a directory, will only have the
 ##    symlink backed-up, not the target directory's content. Yes, you have to
diff --git a/handlers/rdiff.in b/handlers/rdiff.in
index fdc51147546daf2cb6b83865bdb4f4679699d8e7..5efe1fab5b4ac23968bc455687f6dd4e07d43f32 100644
--- a/handlers/rdiff.in
+++ b/handlers/rdiff.in
@@ -96,8 +96,6 @@ check_consistency "source" "$type" "$user" "$host"
 getconf label
 getconf keep 60
 getconf include
-getconf vsnames all
-getconf vsinclude
 getconf exclude
 
 setsection dest
@@ -240,7 +238,7 @@ IFS=$SAVEIFS
 set +o noglob
 
 # exclude everything else
-[ "$include" != "" -o "$vsinclude" != "" ] && execstr="${execstr}--exclude '/*' "
+[ "$include" != "" ] && execstr="${execstr}--exclude '/*' "
 
 # include client-part and server-part
 execstr="${execstr}$execstr_sourcepart $execstr_destpart"
diff --git a/handlers/svn.in b/handlers/svn.in
index 94afe5ce8daf1293a4053806ccf6855033160dc5..564a273e59c65df3cbf577e89bc0cec181074c7a 100644
--- a/handlers/svn.in
+++ b/handlers/svn.in
@@ -8,7 +8,6 @@ getconf src /var/lib/svn
 getconf dest /var/backups/svn
 getconf tmp /var/backups/svn.tmp
 getconf HOTBACKUP "/usr/bin/svnadmin hotcopy"
-getconf vsname
 
 error=0