diff --git a/SPECS/java_cup.spec b/SPECS/java_cup.spec
index 158e5e6..d5d54a4 100644
--- a/SPECS/java_cup.spec
+++ b/SPECS/java_cup.spec
@@ -1,9 +1,10 @@
+%bcond_with bootstrap
+
 %global pkg_version     11b
-%global with_bootstrap  0
 
 Name:           java_cup
 Version:        0.11b
-Release:        10%{?dist}
+Release:        20%{?dist}
 Epoch:          1
 Summary:        LALR parser generator for Java
 License:        MIT
@@ -19,10 +20,18 @@ Source4:        %{name}-runtime-MANIFEST.MF
 
 Patch0:         %{name}-build.patch
 
-BuildRequires:  ant
 BuildRequires:  javapackages-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  ant
 BuildRequires:  jflex
-BuildRequires:  java_cup >= 1:0.11a
+BuildRequires:  java_cup
+%endif
+
+# Explicit javapackages-tools requires since scripts use
+# /usr/share/java-utils/java-functions
+Requires:       javapackages-tools
 
 
 %description
@@ -60,9 +69,9 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar
 %build
 export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
 
-ant -Dcupversion=20150326 -Dsvnversion=65
+%ant -Dcupversion=20150326 -Dsvnversion=65
 find -name parser.cup -delete
-ant javadoc
+%ant javadoc
 
 # inject OSGi manifests
 jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
@@ -74,7 +83,11 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 
 %mvn_install -J dist/javadoc
 
+# wrapper script for direct execution
+%jpackage_script java_cup.Main "" "" java_cup cup true
+
 %files -f .mfiles
+%{_bindir}/cup
 %doc changelog.txt
 %license licence.txt
 
@@ -86,12 +99,50 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 %license licence.txt
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.11b-20
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-19
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-18
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-17
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.11b-14
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jun 25 2020 Roland Grunberg <rgrunber@redhat.com> - 1:0.11b-13
+- Use source/target of 1.6 to build against Java 11.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-10
 - Mass rebuild for javapackages-tools 201902
 
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-9
 - Mass rebuild for javapackages-tools 201901
 
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild