diff --git a/databinder-draw/Rakefile b/databinder-draw/Rakefile
deleted file mode 100644
index e5a6169c..00000000
--- a/databinder-draw/Rakefile
+++ /dev/null
@@ -1,21 +0,0 @@
-require "buildr"
-
-repositories.remote << "http://repo1.maven.org/maven2/"
-repositories.remote << "http://wicketstuff.org/maven/repository/"
-repositories.remote << "http://databinder.net/snapshot/"
-
-desc "Databinder draw"
-define "databinder-draw" do
-	BATIK_ZIP = download(artifact("org.apache.batik:batik:zip:1.7-beta1") => "http://apache.mirrors.tds.net/xmlgraphics/batik/batik-1.7beta1.zip")
-	BATIK_GVT = child_artifact("org.apache.batik:batik-gvt:jar:1.7-beta1", BATIK_ZIP, "batik-1.7/lib/batik-gvt.jar")
-	BATIK_AWT_UTIL = child_artifact("org.apache.batik:batik-awt-util:jar:1.7-beta1", BATIK_ZIP, "batik-1.7/lib/batik-awt-util.jar")
-
-	project.version = "1.1-SNAPSHOT"
-	project.group = "net.databinder"
-
-	compile.options.target = "1.5"
-	compile.with [DATABINDER, BATIK_GVT, BATIK_AWT_UTIL]	# should really just be databinder-components
-
-	package :jar
-
-end
diff --git a/databinder-draw/pom.slip b/databinder-draw/pom.slip
index 29723098..d14e565f 100644
--- a/databinder-draw/pom.slip
+++ b/databinder-draw/pom.slip
@@ -18,11 +18,11 @@ project(xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance",xmlns="http://mave
 			artifactId: "databinder-components"
 
 		dependency:
-			groupId: "org.apache.batik"
+			groupId: "org.apache.xmlgraphics"
 			artifactId: "batik-gvt"
 			version: "1.7"
 
 		dependency:
-			groupId: "org.apache.batik"
+			groupId: "org.apache.xmlgraphics"
 			artifactId: "batik-awt-util"
 			version: "1.7"
diff --git a/databinder-draw/pom.xml b/databinder-draw/pom.xml
index 354ee441..75aa110e 100644
--- a/databinder-draw/pom.xml
+++ b/databinder-draw/pom.xml
@@ -16,12 +16,12 @@
    <artifactId>databinder-components</artifactId>
   </dependency>
   <dependency>
-   <groupId>org.apache.batik</groupId>
+   <groupId>org.apache.xmlgraphics</groupId>
    <artifactId>batik-gvt</artifactId>
    <version>1.7</version>
   </dependency>
   <dependency>
-   <groupId>org.apache.batik</groupId>
+   <groupId>org.apache.xmlgraphics</groupId>
    <artifactId>batik-awt-util</artifactId>
    <version>1.7</version>
   </dependency>
diff --git a/pom.slip b/pom.slip
index aa9d7bcb..d45a5e76 100644
--- a/pom.slip
+++ b/pom.slip
@@ -34,6 +34,7 @@ project(xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance",xmlns="http://mave
 		module: "databinder-app-ao"
 		module: "databinder-app-cay"
 		module: "databinder-dispatch"
+		module: "databinder-draw"
 	scm:
 		connection: "scm:svn:svn://localhost/databinder/trunk"
 		developerConnection: "scm:svn:svn://localhost/databinder/trunk"
diff --git a/pom.xml b/pom.xml
index 22731379..1e144ce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
   <module>databinder-app-ao</module>
   <module>databinder-app-cay</module>
   <module>databinder-dispatch</module>
+  <module>databinder-draw</module>
  </modules>
  <scm>
   <connection>scm:svn:svn://localhost/databinder/trunk</connection>