diff --git a/build-scripts/olpc.jhbuildrc b/build-scripts/olpc.jhbuildrc
index 336c8df..418f888 100644
--- a/build-scripts/olpc.jhbuildrc
+++ b/build-scripts/olpc.jhbuildrc
@@ -7,6 +7,9 @@ moduleset = [ 'gnome-2.16' ]
 moduleset.append(os.path.join(base_dir, 'build-scripts', 'sugar.modules'))
 modules = [ 'sugar' ]
 
+branches['abiword'] = 'sugar'
+skip = [ 'libxml2' ]
+
 user_config = os.path.expanduser('~/.olpc.jhbuildrc')
 if os.path.isfile(user_config):
 	try:
diff --git a/build-scripts/sugar.modules b/build-scripts/sugar.modules
index 4c416d0..b918dfd 100644
--- a/build-scripts/sugar.modules
+++ b/build-scripts/sugar.modules
@@ -8,6 +8,9 @@
   <repository type="cvs" name="mozilla.org"
       cvsroot=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"
       password="anonymous"/>
+  <repository type="cvs" name="abisource.com"
+      cvsroot=":pserver:anoncvs@anoncvs.abisource.com:/cvsroot"
+      password=""/>
   <repository type="git" name="git.laptop.org" default="yes"
       href="git://dev.laptop.org/"/>
   <repository type="svn" name="matchbox.o-hand.com"
@@ -74,4 +77,7 @@
       <dep package="gnome-python"/>
     </dependencies>
   </autotools>
+  <autotools id="abiword" autogenargs="--enable-sugar --enable-symbols --disable-debug --disable-gnome">
+    <branch repo="abisource.com" module="abi" checkoutdir="abiword"/>
+  </autotools>
 </moduleset>