-sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-4
-sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-5
-nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-6
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxcbuild
-pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
-pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11
+sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-24
+sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9
+nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-7
+# this module still has changes that won't run on the mainstream distrib
+bootmanager-BRANCH := lxc_devel
+bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxc_devel
+pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@master
+pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@master