diff --git a/default.xml b/default.xml
index 4b90695..f82ee51 100644
--- a/default.xml
+++ b/default.xml
@@ -35,7 +35,7 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/stringbench" name="platform/external/stringbench" revision="master" />
diff --git a/landing-snowball.xml b/landing-snowball.xml
index 16758f2..61224b6 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -38,7 +38,7 @@
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/linaro-default.xml b/linaro-default.xml
index ae9d298..de9e957 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -36,7 +36,7 @@
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 41e5e23..1645c7d 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -32,7 +32,7 @@
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
   <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/>
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/stringbench" name="platform/external/stringbench" revision="master" />
diff --git a/staging-origen.xml b/staging-origen.xml
index c2dce1c..9be6f8c 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -37,7 +37,7 @@
   <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" />
   <project path="u-boot" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other"/>
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/staging-panda.xml b/staging-panda.xml
index 9c2c1b5..a2a108a 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -34,7 +34,7 @@
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index c57c505..3b6f53f 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -46,7 +46,7 @@
   <project path="external/tools_for_pm-qa" name="tools/tools_for_pm-qa" revision="master" />
   <project path="test/linaro/biglittle/core" name="people/plars/core" revision="master" remote="linaro-private"/>
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 939f06e..a3138d1 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -45,7 +45,7 @@
   <project path="external/tools_for_pm-qa" name="tools/tools_for_pm-qa" revision="master" />
   <project path="test/linaro/biglittle/core" name="test/linaro/biglittle/core" revision="linaro"/>
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 46b47c6..5c0d338 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -37,7 +37,7 @@
   <project path="u-boot" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" />
   <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/tracking-panda.xml b/tracking-panda.xml
index 834c57a..50cfa55 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -33,7 +33,7 @@
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 9a073a4..dba2752 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -36,7 +36,7 @@
   <project path="u-boot" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" />
   <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" />
   <project path="packages/wallpapers/LinaroWallpaper" name="platform/packages/wallpapers/LinaroWallpaper" revision="master" />
-  <project path="external/powertop" name="platform/external/powertop" revision="linaro"/>
+  <project path="external/powertop" name="tools/powertop-2.0" revision="linaro" remote="linaro-other" />
   <project path="external/ncurses" name="platform/external/ncurses" revision="linaro"/>
   <project path="external/libnl" name="platform/external/libnl" revision="linaro"/>
   <project path="external/iozone" name="platform/external/iozone" revision="linaro_android"/>
