-linux-2.6-BRANCH := rhel6
-linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-5
-madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@master
-iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
-iptables-BUILD-FROM-SRPM := yes # tmp
-iproute-BUILD-FROM-SRPM := yes
-iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.33-2
-util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10
-util-vserver-BUILD-FROM-SRPM := yes # tmp
-libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-21
-nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6
+mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
+linux-2.6-BRANCH := 32
+linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27
+# help out spec2make on f8 and centos5, due to a bug in rpm
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
+kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
+endif
+kernel-DEVEL-RPMS += elfutils-libelf-devel
+madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-5
+iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5
+# we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
+# note that this should be consistently reflected in pl_getKexcludes in build.common
+ALL := $(filter-out iproute,$(ALL))
+util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-19
+libnl-GITPATH := git://git.planet-lab.org/libnl.git@libnl-1.1-2
+util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
+nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9