diff --git a/.cvsignore b/.cvsignore
index 108b8a4..e4ab5a8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,10 +1,7 @@
-batik-manifests.patch
-batik-policy.patch
batik.rasterizer.script
batik.slideshow.script
batik-squiggle.desktop
batik.squiggle.script
batik-src-1.7.zip
-batik-sun-codecs.patch
batik.svgpp.script
batik.ttf2svg.script
diff --git a/batik-manifests.patch b/batik-manifests.patch
new file mode 100644
index 0000000..d24763f
--- /dev/null
+++ b/batik-manifests.patch
@@ -0,0 +1,151 @@
+diff -ruN batik-1.7.old/sources/batik-browser-ext.mf batik-1.7/sources/batik-browser-ext.mf
+--- batik-1.7.old/sources/batik-browser-ext.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-browser-ext.mf 2007-11-23 12:30:47.000000000 -0500
+@@ -1,4 +1,2 @@
+ Manifest-Version: 1.0
+-Class-Path: ../batik-squiggle.jar \
+- ../lib/batik-extension.jar
+ Main-Class: org.apache.batik.apps.svgbrowser.Main
+diff -ruN batik-1.7.old/sources/batik-browser.mf batik-1.7/sources/batik-browser.mf
+--- batik-1.7.old/sources/batik-browser.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-browser.mf 2007-11-23 12:30:03.000000000 -0500
+@@ -1,23 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.svgbrowser.Main
+-Class-Path: lib/batik-ext.jar \
+- lib/batik-dom.jar \
+- lib/batik-css.jar \
+- lib/batik-svg-dom.jar \
+- lib/batik-gvt.jar \
+- lib/batik-parser.jar \
+- lib/batik-script.jar \
+- lib/batik-bridge.jar \
+- lib/batik-swing.jar \
+- lib/batik-anim.jar \
+- lib/batik-transcoder.jar \
+- lib/batik-gui-util.jar \
+- lib/batik-awt-util.jar \
+- lib/batik-codec.jar \
+- lib/batik-util.jar \
+- lib/batik-xml.jar \
+- lib/xerces_2_5_0.jar \
+- lib/xalan-2.6.0.jar \
+- lib/xml-apis.jar \
+- lib/xml-apis-ext.jar \
+- lib/js.jar
+diff -ruN batik-1.7.old/sources/batik.mf batik-1.7/sources/batik.mf
+--- batik-1.7.old/sources/batik.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik.mf 2007-11-23 12:31:02.000000000 -0500
+@@ -1,29 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.svgbrowser.Main
+-Class-Path: lib/batik-ext.jar \
+- lib/batik-dom.jar \
+- lib/batik-css.jar \
+- lib/batik-svg-dom.jar \
+- lib/batik-gvt.jar \
+- lib/batik-parser.jar \
+- lib/batik-script.jar \
+- lib/batik-bridge.jar \
+- lib/batik-swing.jar \
+- lib/batik-anim.jar \
+- lib/batik-transcoder.jar \
+- lib/batik-gui-util.jar \
+- lib/batik-awt-util.jar \
+- lib/batik-codec.jar \
+- lib/batik-util.jar \
+- lib/batik-root.jar \
+- lib/batik-svggen.jar \
+- lib/batik-xml.jar \
+- batik-squiggle.jar \
+- batik-rasterizer.jar \
+- batik-pp.jar \
+- lib/xerces_2_5_0.jar \
+- lib/xalan-2.6.0.jar \
+- lib/xml-apis.jar \
+- lib/xml-apis-ext.jar \
+- lib/pdf-transcoder.jar \
+- lib/js.jar
+diff -ruN batik-1.7.old/sources/batik-pp.mf batik-1.7/sources/batik-pp.mf
+--- batik-1.7.old/sources/batik-pp.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-pp.mf 2007-11-23 12:30:39.000000000 -0500
+@@ -1,10 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.svgpp.Main
+-Class-Path: lib/batik-ext.jar \
+- lib/batik-dom.jar \
+- lib/batik-parser.jar \
+- lib/batik-transcoder.jar \
+- lib/batik-util.jar \
+- lib/batik-xml.jar \
+- lib/xml-apis.jar \
+- lib/xml-apis-ext.jar
+diff -ruN batik-1.7.old/sources/batik-rasterizer-ext.mf batik-1.7/sources/batik-rasterizer-ext.mf
+--- batik-1.7.old/sources/batik-rasterizer-ext.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-rasterizer-ext.mf 2007-11-23 12:30:54.000000000 -0500
+@@ -1,4 +1,2 @@
+ Manifest-Version: 1.0
+-Class-Path: ../batik-rasterizer.jar \
+- ../lib/batik-extension.jar
+ Main-Class: org.apache.batik.apps.rasterizer.Main
+diff -ruN batik-1.7.old/sources/batik-rasterizer.mf batik-1.7/sources/batik-rasterizer.mf
+--- batik-1.7.old/sources/batik-rasterizer.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-rasterizer.mf 2007-11-23 12:30:20.000000000 -0500
+@@ -1,22 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.rasterizer.Main
+-Class-Path: lib/batik-ext.jar \
+- lib/batik-dom.jar \
+- lib/batik-css.jar \
+- lib/batik-svg-dom.jar \
+- lib/batik-gvt.jar \
+- lib/batik-parser.jar \
+- lib/batik-script.jar \
+- lib/batik-bridge.jar \
+- lib/batik-anim.jar \
+- lib/batik-transcoder.jar \
+- lib/batik-awt-util.jar \
+- lib/batik-codec.jar \
+- lib/batik-util.jar \
+- lib/batik-xml.jar \
+- lib/xerces_2_5_0.jar \
+- lib/xalan-2.6.0.jar \
+- lib/xml-apis.jar \
+- lib/xml-apis-ext.jar \
+- lib/pdf-transcoder.jar \
+- lib/js.jar
+diff -ruN batik-1.7.old/sources/batik-slideshow.mf batik-1.7/sources/batik-slideshow.mf
+--- batik-1.7.old/sources/batik-slideshow.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-slideshow.mf 2007-11-23 12:30:31.000000000 -0500
+@@ -1,23 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.slideshow.Main
+-Class-Path: lib/batik-ext.jar \
+- lib/batik-dom.jar \
+- lib/batik-css.jar \
+- lib/batik-svg-dom.jar \
+- lib/batik-gvt.jar \
+- lib/batik-parser.jar \
+- lib/batik-script.jar \
+- lib/batik-bridge.jar \
+- lib/batik-swing.jar \
+- lib/batik-anim.jar \
+- lib/batik-transcoder.jar \
+- lib/batik-gui-util.jar \
+- lib/batik-awt-util.jar \
+- lib/batik-codec.jar \
+- lib/batik-util.jar \
+- lib/batik-xml.jar \
+- lib/xerces_2_5_0.jar \
+- lib/xalan-2.6.0.jar \
+- lib/xml-apis.jar \
+- lib/xml-apis-ext.jar \
+- lib/js.jar
+diff -ruN batik-1.7.old/sources/batik-ttf2svg.mf batik-1.7/sources/batik-ttf2svg.mf
+--- batik-1.7.old/sources/batik-ttf2svg.mf 2007-03-26 11:53:18.000000000 -0400
++++ batik-1.7/sources/batik-ttf2svg.mf 2007-11-23 12:30:11.000000000 -0500
+@@ -1,4 +1,2 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.batik.apps.ttf2svg.Main
+-Class-Path: lib/batik-svggen.jar \
+- lib/batik-util.jar
diff --git a/batik-policy.patch b/batik-policy.patch
new file mode 100644
index 0000000..df4eafe
--- /dev/null
+++ b/batik-policy.patch
@@ -0,0 +1,34 @@
+diff -uNr batik-1.7-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy batik-1.7/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
+--- batik-1.7-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy 2007-09-07 14:05:13.000000000 -0400
++++ batik-1.7/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy 2007-09-12 13:36:24.000000000 -0400
+@@ -30,6 +30,11 @@
+ permission java.security.AllPermission;
+ };
+
++//new stuff
++grant codeBase "${app.jar.base}/batik-all.jar" {
++ permission java.security.AllPermission;
++};
++
+ grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
+ permission java.security.AllPermission;
+ };
+diff -uNr batik-1.7-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy batik-1.7/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
+--- batik-1.7-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy 2007-09-07 14:05:13.000000000 -0400
++++ batik-1.7/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy 2007-09-12 13:36:49.000000000 -0400
+@@ -34,6 +34,10 @@
+ permission java.security.AllPermission;
+ };
+
++grant codeBase "${app.jar.base}/batik-all.jar" {
++ permission java.security.AllPermission;
++};
++
+ grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
+ permission java.security.AllPermission;
+ };
+@@ -104,4 +108,3 @@
+ grant {
+ permission java.io.FilePermission "lib/batik-svg-dom.jar", "read";
+ };
+-
diff --git a/batik-sun-codecs.patch b/batik-sun-codecs.patch
new file mode 100644
index 0000000..e8d34ee
--- /dev/null
+++ b/batik-sun-codecs.patch
@@ -0,0 +1,13 @@
+--- /home/tbento/build.xml 2007-08-23 10:46:31.000000000 -0400
++++ build.xml 2007-08-23 10:48:38.000000000 -0400
+@@ -669,7 +669,9 @@
+
+
+
+-
++
+
+
diff --git a/sources b/sources
index 02bfef2..73c1e6e 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,7 @@
-9b684cc1b7dec8fd9cfbe87804bafe41 batik-manifests.patch
-14e4eb938296d4dc0665d9188eda211e batik-policy.patch
e530457cf892f80e9192c1cd94bf28b6 batik.rasterizer.script
6bf2b55d5f76828b3e21dd0b53eb1874 batik.slideshow.script
c20cbde45a96e45bf6e657b50b4fa8e2 batik-squiggle.desktop
a5aaf0dbce15fbea6f1e434c8f03e569 batik.squiggle.script
fb1f6a7e996d44e417398e2f5067658b batik-src-1.7.zip
-0b3cc983d630f7bc2bd84978797c9bf6 batik-sun-codecs.patch
0e2b0bc15b89eef1b72306ebcce4075b batik.svgpp.script
96002f6d0e61453b72dc8183e0dce9c8 batik.ttf2svg.script