-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn//NodeUpdate/tags/NodeUpdate-0.5-4
-PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn//PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNBRANCH := 1.8
-NodeManager-SVNPATH := http://svn.planet-lab.org/svn//NodeManager/tags/NodeManager-1.8-3
-pyplnet-SVNPATH := http://svn.planet-lab.org/svn//pyplnet/tags/pyplnet-4.3-2
-pl_sshd-SVNPATH := http://svn.planet-lab.org/svn//pl_sshd/tags/pl_sshd-1.0-11
-CoDemux-SVNPATH := http://svn.planet-lab.org/svn//CoDemux/tags/CoDemux-0.1-13
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn//fprobe-ulog/tags/fprobe-ulog-1.1.3-0
-pf2slice-SVNPATH := http://svn.planet-lab.org/svn//pf2slice/tags/pf2slice-1.0-2
-Mom-SVNPATH := http://svn.planet-lab.org/svn//Mom/tags/Mom-2.3-1
-iptables-SVNPATH := http://svn.planet-lab.org/svn//iptables/tags/iptables-1.4.1.1-0
-iproute2-SVNPATH := http://svn.planet-lab.org/svn//iproute2/tags/iproute2-2.6.16-2
-inotify-tools-SVNPATH := http://svn.planet-lab.org/svn//inotify-tools/tags/inotify-tools-3.13-2
+# this branch is numbered 0.4 in the specfile
+# initial tag would be tags/util-vserver-pl-0.4-3
+util-vserver-pl-SVNBRANCH := trellis
+util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
+NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5
+PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
+NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-11
+# Trellis-specific NodeManager plugins
+NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
+NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
+pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4
+pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
+CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0
+pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
+iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk
+iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2