diff --git a/jflex-bootstrap.changes b/jflex-bootstrap.changes
index d6d3412..e892b06 100644
--- a/jflex-bootstrap.changes
+++ b/jflex-bootstrap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against standalone glassfish-annotation-api for relevant
+  distribution versions that have JDK that does not contain the
+  JavaEE modules
+
 -------------------------------------------------------------------
 Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jflex-bootstrap.spec b/jflex-bootstrap.spec
index 7e8f979..9dcaf39 100644
--- a/jflex-bootstrap.spec
+++ b/jflex-bootstrap.spec
@@ -31,6 +31,9 @@ Source1:        jflex-%{version}-generated-files.tar.xz
 Source2:        jflex-build.xml
 Patch0:         jflex-1.8.2-no-auto-value.patch
 BuildRequires:  ant
+%if 0%{?suse_version} > 1500
+BuildRequires:  glassfish-annotation-api
+%endif
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 Requires:       java_cup
@@ -94,9 +97,12 @@ rm -rf src/generated
 %if %{with bootstrap}
 %setup -q -T -D -a 1 -n jflex-%{version}
 cp %{SOURCE2} build.xml
-%patch0 -p1
 mkdir -p lib
+%patch0 -p1
 build-jar-repository -s lib java-cup-runtime
+%if 0%{?suse_version} > 1500
+build-jar-repository -s lib glassfish-annotation-api
+%endif
 %else
 %{mvn_file} : %{name} JFlex
 %endif
diff --git a/jflex.changes b/jflex.changes
index d6d3412..e892b06 100644
--- a/jflex.changes
+++ b/jflex.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 17 15:42:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against standalone glassfish-annotation-api for relevant
+  distribution versions that have JDK that does not contain the
+  JavaEE modules
+
 -------------------------------------------------------------------
 Fri Jan 14 07:05:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jflex.spec b/jflex.spec
index 44d63b1..ce0046e 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -30,6 +30,9 @@ Source1:        jflex-%{version}-generated-files.tar.xz
 Source2:        jflex-build.xml
 Patch0:         jflex-1.8.2-no-auto-value.patch
 BuildRequires:  ant
+%if 0%{?suse_version} > 1500
+BuildRequires:  glassfish-annotation-api
+%endif
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 Requires:       java_cup
@@ -93,9 +96,12 @@ rm -rf src/generated
 %if %{with bootstrap}
 %setup -q -T -D -a 1 -n jflex-%{version}
 cp %{SOURCE2} build.xml
-%patch0 -p1
 mkdir -p lib
+%patch0 -p1
 build-jar-repository -s lib java-cup-runtime
+%if 0%{?suse_version} > 1500
+build-jar-repository -s lib glassfish-annotation-api
+%endif
 %else
 %{mvn_file} : %{name} JFlex
 %endif