diff --git a/doceo.modules b/doceo.modules
index 0c31769..8c09bf9 100644
--- a/doceo.modules
+++ b/doceo.modules
@@ -7,7 +7,7 @@
     href="http://files.itstool.org/itstool/"/>
 
   <autotools id="yelp-tools">
-    <branch revision="gnome-3-6"/>
+    <branch revision="master"/>
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
@@ -18,7 +18,7 @@
   </autotools>
 
   <autotools id="yelp-xsl">
-    <branch revision="gnome-3-6"/>
+    <branch revision="gnome-3-18"/>
     <dependencies>
       <dep package="libxslt"/>
       <dep package="libxml2"/>
@@ -29,10 +29,10 @@
 
   <autotools id="itstool">
     <branch repo="itstool.org"
-            module="itstool-1.2.0.tar.bz2"
-            version="1.2.0"
-            hash="sha256:46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa"
-            size="82479"/>
+            module="itstool-2.0.2.tar.bz2"
+            version="2.0.2"
+            hash="sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
+            size="96748"/>
   </autotools>
 
 </moduleset>
diff --git a/jhbuildrc b/jhbuildrc
index d700cbf..1f72454 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -2,6 +2,6 @@ import os
 
 prefix = os.path.abspath(os.path.join(os.path.dirname(__file__), 'jhbuild'))
 checkoutroot = os.path.join(prefix, 'src')
-use_lib64 = False
-
+modulesets_dir = os.path.abspath(os.path.join(prefix, '..'))
+use_local_modulesets = True
 moduleset = 'doceo.modules'