diff --git a/build.xml b/build.xml
index fe1723587..a78c4d738 100644
--- a/build.xml
+++ b/build.xml
@@ -69,8 +69,6 @@
 
     <property environment="env"/>
 
-    <property name="drmaa.jar" value="${env.SGE_ROOT}/lib/drmaa.jar" />
-
     <patternset id="java.source.pattern">
         <include name="${java.public.source.dir}/**/*.java" />
         <include name="${java.private.source.dir}/**/*.java" if="include.private" />
@@ -146,11 +144,7 @@
         <property name="init.resolve.done" value="true"/>
     </target>
 
-    <target name="init.gridengine" depends="init" if="include.gridengine">
-        <copy todir="lib" file="${drmaa.jar}"/>
-    </target>
-
-    <target name="resolve" depends="init.resolve,init,init.gridengine"
+    <target name="resolve" depends="init.resolve,init"
             description="locate and download library dependencies">
         <property name="ivy.conf" value="default"/>
       <ivy:retrieve file="ivy.xml" conf="${ivy.conf}" />
@@ -178,13 +172,23 @@
         <property name="build.version" value="${git.describe.output}" />
     </target>
     
-    <target name="untagged.build.version" depends="git.describe" unless="git.describe.succeeded">
-      <exec executable="git" outputproperty="build.version" failonerror="true">
+    <target name="git.rev-parse" depends="git.describe" unless="git.describe.succeeded">
+      <exec executable="git" outputproperty="git.rev-parse.output" resultproperty="git.rev-parse.exit.value" failonerror="false">
         <arg line="rev-parse HEAD" />
       </exec>
+      <condition property="git.rev-parse.succeeded">
+        <equals arg1="${git.rev-parse.exit.value}" arg2="0" />
+      </condition>
     </target>
     
-    <target name="generate.build.version" depends="tagged.build.version, untagged.build.version" />
+    <target name="untagged.build.version" depends="git.rev-parse" if="git.rev-parse.succeeded">
+        <property name="build.version" value="${git.rev-parse.output}" />
+    </target>
+    
+    <target name="generate.build.version" depends="tagged.build.version, untagged.build.version">
+        <!-- Set build.version to exported if no other value has been set -->
+        <property name="build.version" value="exported" />
+    </target>
 
     <!-- define some key locations that might change based on how the build is run -->
     <target name="init" depends="generate.build.version">
@@ -214,12 +218,6 @@
             </or>
         </condition>
 
-        <!-- Include Grid Engine in the compile if SGE_ROOT is available. -->
-        <!-- Based off of http://wikis.sun.com/display/GridEngine/Automating+Grid+Engine+Functions+Through+DRMAA -->
-        <condition property="include.gridengine">
-            <available file="${drmaa.jar}"/>
-        </condition>
-
         <echo message="GATK build      : ${gatk.target}"/>
         <echo message="Scala build     : ${scala.target}"/>
       <echo message="source revision : ${build.version}"/>
@@ -357,7 +355,6 @@
             <src path="${scala.public.source.dir}" />
             <src path="${queue-extensions.source.dir}" />
             <include name="**/*.scala"/>
-            <exclude name="**/gridengine/**" unless="include.gridengine" />
         </scalac>    
     </target>
     
@@ -374,7 +371,6 @@
         <scalac fork="true" jvmargs="-Xmx512m" destdir="${scala.classes}" classpathref="scala.dependencies" deprecation="yes" unchecked="yes">
             <src path="${scala.private.source.dir}" />
             <include name="**/*.scala"/>
-            <exclude name="**/gridengine/**" unless="include.gridengine" />
         </scalac>       
     </target>
 
@@ -682,7 +678,6 @@
 	        <src path="${scala.public.test.sources}" />
 	        <src path="${scala.private.test.sources}" />
             <include name="**/*.scala"/>
-            <exclude name="**/gridengine/**" unless="include.gridengine" />
             <classpath>
                 <path refid="scala.dependencies"/>
                 <pathelement location="${scala.test.classes}"/>
diff --git a/ivy.xml b/ivy.xml
index c2a6c4ccd..10e4ee570 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -48,6 +48,9 @@
     <!-- Dependencies for amazon.com S3 support -->
     <dependency org="net.java.dev.jets3t" name="jets3t" rev="0.8.0"/>
 
+    <!-- Dependencies for GridEngine -->
+    <dependency org="net.sf.gridscheduler" name="drmaa" rev="latest.integration"/>
+
     <!-- Scala dependancies -->
     <dependency org="org.scala-lang" name="scala-compiler" rev="2.8.1"/>
     <dependency org="org.scala-lang" name="scala-library" rev="2.8.1"/>
diff --git a/settings/ivysettings.xml b/settings/ivysettings.xml
index 1e47fa847..2c8fc388f 100644
--- a/settings/ivysettings.xml
+++ b/settings/ivysettings.xml
@@ -25,5 +25,6 @@
     <module organisation="javax.activation" resolver="java.net" />
     <module organisation="net.java.dev.jna" resolver="maven2-repository.dev.java.net" />
     <module organisation="com.google.code.caliper" resolver="projects" />
+    <module organisation="net.sf.gridscheduler" resolver="projects" />
   </modules>
 </ivysettings>
diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar
new file mode 100644
index 000000000..dc77c7d33
Binary files /dev/null and b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2-sources.jar differ
diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.jar b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.jar
new file mode 100644
index 000000000..f267be4b5
Binary files /dev/null and b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.jar differ
diff --git a/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml
new file mode 100644
index 000000000..c6a8da052
--- /dev/null
+++ b/settings/repository/net.sf.gridscheduler/drmaa-6.2u5p2.xml
@@ -0,0 +1,3 @@
+<ivy-module version="1.0">
+    <info organisation="net.sf.gridscheduler" module="drmaa" revision="6.2u5p2" status="release" />
+</ivy-module>