diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 4e3b4e7..3cea726 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -284,10 +284,15 @@
 # but in time of bootstrap of next jdk, it is featurever-1,
 # and this it is better to change it here, on single place
 %global buildjdkver 17
-# We don't add any LTS designator for STS packages (this package).
-# Neither for Fedora nor EPEL which would have %%{rhel} macro defined.
+# We don't add any LTS designator for STS packages (Fedora and EPEL).
+# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
+%if 0%{?rhel} && !0%{?epel}
+  %global lts_designator "LTS"
+  %global lts_designator_zip -%{lts_designator}
+%else
  %global lts_designator ""
  %global lts_designator_zip ""
+%endif
 
 # Define IcedTea version used for SystemTap tapsets and desktop file
 %global icedteaver      3.15.0
@@ -298,7 +303,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        35
-%global rpmrelease      7
+%global rpmrelease      8
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -2280,6 +2285,14 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Tue Nov 09 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.35-8
+- Extend LTS check to exclude EPEL.
+- Related: rhbz#2013846
+
+* Tue Nov 09 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.0.0.35-8
+- Set LTS designator.
+- Related: rhbz#2013846
+
 * Mon Nov 08 2021 Jiri Vanek <jvanek@redhat.com> - 1:17.0.0.0.35-7
 - alternatives creation moved to posttrans
 - Thus fixing the old reisntall issue: