diff --git a/build.xml b/build.xml
index 2b321cd50..a3e60b8c1 100644
--- a/build.xml
+++ b/build.xml
@@ -32,7 +32,7 @@ PROPERTIES
   <!-- Defines the product being built -->
   <property name="vendor.name" value="LAMP/EPFL"/>
   <property name="copyright.string" value="(c) 2002-2008 ${vendor.name}"/>
-  <property name="java.flags" value="-Xmx256M -Xms16M"/>
+  <property name="java.flags" value="-Xmx768M -Xms16M"/>
   <property name="number.file" value="${basedir}/build.number"/>
 
   <!-- Configuring how the compiler is run -->
@@ -975,6 +975,7 @@ MSIL
            assemname="${msil.dir}/predef" assemrefs="${lib.dir}"
            failonerror="false">
       <include name="scala/Predef.scala"/>
+      <include name="scala/Option.scala"/>
       <include name="scala/Console.scala"/>
       <include name="scala/Application.scala"/>
       <include name="scala/ByNameFunction.scala"/>