diff --git a/.gitignore b/.gitignore
index bfd0d32..daa0ee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 java_cup_v10k.tar.gz
 java_cup-0.11a.tar.bz2
 /java_cup-0.11b.tar.bz2
-/java_cup-0.11b.tar.zst
diff --git a/0002-Set-Java-source-target-to-1.8.patch b/0002-Set-Java-source-target-to-1.8.patch
new file mode 100644
index 0000000..b62e62e
--- /dev/null
+++ b/0002-Set-Java-source-target-to-1.8.patch
@@ -0,0 +1,25 @@
+From 202fbfcbb7c179dcd40e7b296604febb10a8c256 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Wed, 21 Feb 2024 12:13:45 +0100
+Subject: [PATCH] Set Java source/target to 1.8
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index d5c2b54..cb1dfd1 100644
+--- a/build.xml
++++ b/build.xml
+@@ -57,7 +57,7 @@
+        token="+ version_str"
+        value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
+     </replace>
+-    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
++    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.8" target="1.8">
+       <classpath refid="libraries"/>
+     </javac>
+   </target>
+-- 
+2.43.0
+
diff --git a/0001-Adopt-build-script.patch b/java_cup-build.patch
similarity index 51%
rename from 0001-Adopt-build-script.patch
rename to java_cup-build.patch
index 4d476d5..d1e400b 100644
--- a/0001-Adopt-build-script.patch
+++ b/java_cup-build.patch
@@ -1,16 +1,5 @@
-From d58d0d2cb2626b15077eaf902f16f7a6bca41933 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Wed, 16 Jul 2025 18:15:17 +0200
-Subject: [PATCH] Adopt build script
-
----
- build.xml | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 33f0c60..975e753 100644
---- a/build.xml
-+++ b/build.xml
+--- java_cup/build.xml~	2014-06-12 17:23:24.000000000 +0200
++++ java_cup/build.xml	2015-06-23 10:30:57.374976304 +0200
 @@ -17,18 +17,6 @@
      <mkdir dir="${java}" />
      <mkdir dir="${classes}" />
@@ -30,17 +19,7 @@ index 33f0c60..975e753 100644
    </target>
  
    <property environment="env" />
-@@ -69,8 +57,7 @@
-        token="+ version_str"
-        value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
-     </replace>
--    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
--      <classpath refid="libraries"/>
-+    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.8" target="1.8">
-     </javac>
-   </target>
- 
-@@ -78,7 +65,6 @@
+@@ -78,7 +66,6 @@
     <jar jarfile="${dist}/java-cup-11b.jar" basedir="${classes}">
        <manifest>
          <attribute name="Main-Class" value="java_cup/Main" />
@@ -48,6 +27,14 @@ index 33f0c60..975e753 100644
        </manifest>
      </jar>
      <jar jarfile="${dist}/java-cup-11b-runtime.jar" basedir="${classes}" includes="java_cup/runtime/*">
--- 
-2.50.1
-
+@@ -143,4 +130,10 @@
+     <echo message="  versionbump    to inc release" />
+   </target>
+ 
++  <target name="javadoc">
++    <mkdir dir="${dist}/javadoc"/>
++    <javadoc destdir="${dist}/javadoc" author="true" version="true" use="true" windowtitle="java_cup API">
++      <fileset dir="src" defaultexcludes="yes" />
++    </javadoc>
++  </target>
+ </project>
diff --git a/java_cup.spec b/java_cup.spec
index 9e974d1..486d835 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -11,29 +11,34 @@ URL:            https://www2.cs.tum.edu/projects/cup/
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-# git clone https://github.com/DrMichaelPetter/cup.git
-# git -C cup archive --prefix java_cup-0.11b/ c35ed3ab0cde2310af9b01321c930349c7c797e2 | zstd -15 >java_cup-0.11b.tar.zst
-Source0:        java_cup-%{version}.tar.zst
+# svn export -r 65 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11b
+# tar cjf java_cup-0.11b.tar.bz2 java_cup-0.11b/
+Source0:        java_cup-%{version}.tar.bz2
 # Add OSGi manifests
 Source2:        %{name}-MANIFEST.MF
 Source4:        %{name}-runtime-MANIFEST.MF
 
-Patch:          0001-Adopt-build-script.patch
+Patch:          %{name}-build.patch
+Patch:          0002-Set-Java-source-target-to-1.8.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  javapackages-local-openjdk25
-BuildRequires:  ant-openjdk25 
+BuildRequires:  javapackages-local
+BuildRequires:  ant
 BuildRequires:  java_cup
 BuildRequires:  jflex
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1:0.11b-57
 
 %description
 java_cup is a LALR Parser Generator for Java
 
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
+
 %package manual
 Summary:        Documentation for java_cup
 
@@ -58,16 +63,18 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar
 export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
 
 %ant -Dcupversion=20150326 -Dsvnversion=65
+find -name parser.cup -delete
+%ant javadoc
 
 # inject OSGi manifests
-%jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
-%jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
+jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
+jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 
 %install
 %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar
 %mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar
 
-%mvn_install
+%mvn_install -J dist/javadoc
 
 # wrapper script for direct execution
 %jpackage_script java_cup.Main "" "" java_cup cup true
@@ -77,6 +84,9 @@ export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
 %doc changelog.txt
 %license licence.txt
 
+%files javadoc -f .mfiles-javadoc
+%license licence.txt
+
 %files manual
 %doc manual.html
 %license licence.txt
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index ae17c0c..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f42
 execute:
   how: tmt
diff --git a/sources b/sources
index 3bdd25b..9a29652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (java_cup-0.11b.tar.zst) = f999ed5c20c35eb2f86aa5b1720f9f38b2c0729edddfbbabe81779d7221b6d3253b92e1b86d4055d2b9da61b644d2196c3d41b025de455ca67c5448d3f02d233
+SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8