diff --git a/batik-javadoc-task-failonerror-and-oom.patch b/batik-javadoc-task-failonerror-and-oom.patch
new file mode 100644
index 0000000..48c2f62
--- /dev/null
+++ b/batik-javadoc-task-failonerror-and-oom.patch
@@ -0,0 +1,14 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 1558779)
++++ build.xml	(working copy)
+@@ -2093,7 +2093,8 @@
+                            org.w3c.css.*,
+                            org.w3c.dom.*"
+              excludepackagenames="${javadoc-exclusions}"
+-             maxmemory="128m"
++             maxmemory="512m"
++             failonerror="yes"
+              destdir="${docs}/javadoc"
+              encoding="UTF-8"
+              docencoding="UTF-8"
diff --git a/batik.slideshow.script b/batik.slideshow.script
index 33b8748..9e4e09b 100644
--- a/batik.slideshow.script
+++ b/batik.slideshow.script
@@ -23,7 +23,7 @@ fi
 
 # Configuration
 MAIN_CLASS=org.apache.batik.apps.slideshow.Main
-BASE_JARS="batik batik-slideshow"
+BASE_JARS="batik batik-slideshow xml-commons-aspis-ext"
 
 # Set parameters
 set_jvm
diff --git a/batik.spec b/batik.spec
index a12e317..2ad5da7 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.8
-Release:        0.10.svn1230816%{?dist}
+Release:        0.11.svn1230816%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            http://xml.apache.org/batik/
@@ -39,6 +39,11 @@ Patch2:		%{name}-script-remove-js.patch
 # FIXME:  move to 1.7 manifest from Eclipse Orbit project
 Patch3:         %{name}-1.6-nosmilInDOMSVGManifest.patch
 
+# make sure we fail build if javadocs fail (run OOM)
+# also make maxmem a bit higher. we seem to need more...
+# https://issues.apache.org/jira/browse/BATIK-1065
+Patch4:         %{name}-javadoc-task-failonerror-and-oom.patch
+
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
@@ -163,6 +168,8 @@ for module in anim awt-util bridge codec css dom ext extension gui-util \
 done
 %patch2
 
+%patch4
+
 %build
 export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext js rhino xalan-j2 xalan-j2-serializer xerces-j2)
 ant all-jar jars\
@@ -316,6 +323,10 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
 
 
 %changelog
+* Thu Jan 16 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8-0.11.svn1230816
+- Fix classpath for slideshow script
+- Change javadoc task maxmem to 512MB to avoid OOM
+
 * Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8-0.10.svn1230816
 - Update to latest packaging guidelines