-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@bootmanager-5.1-5
+nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@master
+bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@master