checkout = git clone ssh://git.debian.org/git/libkdtree/libkdtree.git libkdtree
 
 [code/mailplate]
-checkout = git clone ssh://git.madduck.net/~/git/pub/code/mailplate.git mailplate
+checkout = git clone ssh://git.madduck.net/madduck/pub/code/mailplate.git mailplate
 
 [code/ikiwiki]
 checkout = checkout_hack_branch ikiwiki \
         joeyh git://git.ikiwiki.info/ \
-        ssh://git.madduck.net/~/git/pub/code/ikiwiki.git
+        ssh://git.madduck.net/madduck/pub/code/ikiwiki.git
 
 [code/etckeeper]
 checkout = checkout_hack_branch etckeeper \
         joeyh git://git.kitenet.net/etckeeper \
-        ssh://git.madduck.net/~/git/pub/code/etckeeper.git
-
-[code/vim-git]
-checkout = checkout_hack_branch vim-git \
-        tpope git://git.tpope.net/git/vim-git.git \
-        ssh://git.madduck.net/~/git/pub/code/vim-git.git
+        ssh://git.madduck.net/madduck/pub/code/etckeeper.git
 
 [code/offlineimap]
 checkout = checkout_hack_branch offlineimap \
         jgoerzen git://git.complete.org/offlineimap \
-        ssh://git.madduck.net/~/git/pub/code/offlineimap.git
+        ssh://git.madduck.net/madduck/pub/code/offlineimap.git
+
+[code/ipcfg]
+checkout = checkout_hack_branch ipcfg \
+        yoe http://git.grep.be/gitweb?p=ipcfg.git;a=summary \
+        ssh://git.madduck.net/madduck/pub/code/ipcfg.git
 
 [code/linux-2.6]
 checkout = git clone 'git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git' 'linux-2.6'
 skip = ([ "$1" = update ] && ! hours_since "$1" 12)
 
 [code/libfactory++]
-checkout = git clone 'ssh://git.madduck.net/~/git/pub/code/libfactory++.git' 'libfactory++'
+checkout = git clone 'ssh://git.madduck.net/madduck/pub/code/libfactory++.git' 'libfactory++'
 
 [code/molly-guard]
-checkout = git clone 'ssh://git.madduck.net/~/git/pub/code/molly-guard.git' 'molly-guard'
+checkout = git clone 'ssh://git.madduck.net/madduck/pub/code/molly-guard.git' 'molly-guard'
+
+[code/pytagsfs]
+checkout = bzr clone lp:pytagsfs 'pytagsfs'
+
+[code/unionfs-fuse]
+checkout = hg clone 'http://hg.podgorny.cz/unionfs-fuse' 'unionfs-fuse'
+
+[code/awesome]
+checkout = git clone 'git://git.naquadah.org/awesome.git' 'awesome'
+
+[code/bzr-git]
+checkout = bzr clone 'http://bazaar.launchpad.net/%7Ejelmer/bzr-git/jelmer/' 'bzr-git'
+
+[code/libhid]
+checkout = svn co 'svn+ssh://svn.debian.org/svn/libhid/trunk' 'libhid'
+
+[code/libixs]
+checkout = cvs -d 'cvs.ailab.ch:/home/cvs/ixs' co -d 'libixs' 'libixs'
+
+[code/libligandnet]
+checkout = cvs -d 'cvs.ailab.ch:/home/cvs/ligandnet' co -d 'libligandnet' 'libligandnet'
+
+[code/libphidgets]
+checkout = cvs -d 'cvs.ailab.ch:/home/cvs/external' co -d 'libphidgets' 'libphidgets'
+
+[code/libv4l2++]
+checkout = cvs -d 'cvs.ailab.ch:/home/cvs/external' co -d 'libv4l2++' 'libv4l2++'
+
+[code/mr]
+checkout = git clone 'ssh://git.madduck.net/madduck/pub/code/mr.git' 'mr'
+
+[code/mrsetup]
+checkout = git clone 'ssh://git.madduck.net/madduck/pub/etc/mrsetup.git' 'mrsetup'
+
+[code/offlineimap]
+checkout = git clone 'ssh://git.madduck.net/madduck/pub/code/offlineimap.git' 'offlineimap'
+
+[code/pastebot]
+checkout = git clone 'http://git.dollyfish.net.nz/git/pastebot' 'pastebot'
+
+[code/puppet]
+checkout = git clone 'git://reductivelabs.com/puppet/' 'puppet'
 
 [code/pytagsfs]
-checkout = bzr clone 'http://bazaar.launchpad.net/%7Eforest-alittletooquiet/pytagsfs/dev/' 'pytagsfs'
+checkout = bzr clone 'bzr+ssh://madduck@bazaar.launchpad.net/%7Eforest-bond/pytagsfs/dev/' 'pytagsfs'
 
 [code/unionfs-fuse]
 checkout = hg clone 'http://hg.podgorny.cz/unionfs-fuse' 'unionfs-fuse'