diff --git a/build-scripts/olpc.jhbuildrc b/build-scripts/olpc.jhbuildrc
index 78575aa..02045b2 100644
--- a/build-scripts/olpc.jhbuildrc
+++ b/build-scripts/olpc.jhbuildrc
@@ -11,7 +11,7 @@ moduleset.append(os.path.join(scripts_di
 moduleset.append(os.path.join(scripts_dir, 'sugar-extras.modules'))
 moduleset.append(os.path.join(base_dir, 'build-scripts/jhbuild/modulesets', 'bootstrap.modules'))
 
-modules = [ 'sugar', 'memorygame', 'tamtam', 'etoys' ]
+modules = [ 'sugar', 'memorygame', 'tamtam', 'etoys', 'abiword-olpc' ]
 
 module_autogenargs['dbus'] = '--with-system-socket=/var/run/dbus/system_bus_socket'
 
diff --git a/build-scripts/sugar-activities.modules b/build-scripts/sugar-activities.modules
index 8853ce0..f73665d 100644
--- a/build-scripts/sugar-activities.modules
+++ b/build-scripts/sugar-activities.modules
@@ -15,4 +15,10 @@
        <dep package="squeak" />
      </dependencies>
   </autotools>
+  <bundle id="abiword-olpc">
+    <branch repo="dev.laptop.org/projects" />
+     <dependencies>
+       <dep package="pyabiword" />
+     </dependencies>
+  </bundle>
 </moduleset>
diff --git a/build-scripts/sugar-extras.modules b/build-scripts/sugar-extras.modules
index 10c4649..1b836bd 100644
--- a/build-scripts/sugar-extras.modules
+++ b/build-scripts/sugar-extras.modules
@@ -44,12 +44,18 @@
   <autotools id="wv" >
     <branch repo="abisource.com" module="wv"/>
   </autotools>
-  <autotools id="abiword" autogenargs="--enable-sugar --enable-symbols --disable-debug --disable-gnome --disable-gucharmap">
-    <branch repo="abisource.com" module="abi" checkoutdir="abiword" revision="sugar"/>
+  <autotools id="abiword" autogenargs="--enable-symbols --disable-debug --disable-gnome --disable-gucharmap --enable-libabiword">
+    <branch repo="abisource.com" module="abi" checkoutdir="abiword"/>
     <dependencies>
       <dep package="wv"/>
     </dependencies>
   </autotools>
+  <autotools id="pyabiword" autogenargs="">
+    <branch repo="abisource.com" module="pyabiword" checkoutdir="pyabiword"/>
+    <dependencies>
+      <dep package="abiword"/>
+    </dependencies>
+  </autotools>
   <autotools id="squeak">
     <branch repo="tinlizzie.org"/>
     <dependencies>