diff --git a/java-21-openjdk.changes b/java-21-openjdk.changes
index 1ea5f2f..1d730f9 100644
--- a/java-21-openjdk.changes
+++ b/java-21-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr  1 07:12:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * reproducible-jlink.patch
+    + make the timestamp in jmods reproducible
+
 -------------------------------------------------------------------
 Thu Mar  7 12:44:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index af0a6e4..06a86cf 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -99,6 +99,9 @@
 %global package_version %{featurever}.%{interimver}.%{?updatever:%{updatever}}%{!?updatever:0}.%{?patchver:%{patchver}}%{!?patchver:0}~%{buildver}
 %endif
 %global NSS_LIBDIR %(pkg-config --variable=libdir nss)
+%if 0%{?gcc_version} < 7
+%global with_gcc 7
+%endif
 %bcond_with zero
 %if ! %{with zero}
 %global with_systemtap 1
@@ -158,6 +161,7 @@ Patch11:        reproducible-properties.patch
 Patch12:        adlc-parser.patch
 # Fix: implicit-pointer-decl
 Patch13:        implicit-pointer-decl.patch
+Patch14:        reproducible-jlink.patch
 Patch15:        system-pcsclite.patch
 Patch16:        fips.patch
 #
@@ -179,6 +183,8 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
+BuildRequires:  gcc%{?with_gcc}
+BuildRequires:  gcc%{?with_gcc}-c++
 BuildRequires:  giflib-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java-ca-certificates
@@ -232,13 +238,6 @@ Provides:       jre1.7.x
 Provides:       jre1.8.x
 Provides:       jre1.9.x
 %endif
-%if 0%{?suse_version} < 1500
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
-BuildRequires:  gcc >= 7
-BuildRequires:  gcc-c++ >= 7
-%endif
 %if %{with_system_lcms}
 BuildRequires:  liblcms2-devel
 %endif
@@ -393,6 +392,7 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
 %patch -P 11 -p1
 %patch -P 12 -p1
 %patch -P 13 -p1
+%patch -P 14 -p1
 
 %if %{with_system_pcsc}
 %patch -P 15 -p1
@@ -452,11 +452,11 @@ mkdir -p %{buildoutputdir}
 pushd %{buildoutputdir}
 
 bash ../configure \
-%if 0%{?suse_version} < 1500
-    CPP=cpp-7 \
-    CXX=g++-7 \
-    CC=gcc-7 \
-    NM=gcc-nm-7 \
+%if 0%{?with_gcc}
+    CPP="cpp-%{with_gcc}" \
+    CXX="g++-%{with_gcc}" \
+    CC="gcc-%{with_gcc}" \
+    NM="gcc-nm-%{with_gcc}" \
 %endif
 %if %{is_release}
     --with-version-pre="" \
diff --git a/reproducible-jlink.patch b/reproducible-jlink.patch
new file mode 100644
index 0000000..01e28a3
--- /dev/null
+++ b/reproducible-jlink.patch
@@ -0,0 +1,11 @@
+--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
++++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
+@@ -763,7 +763,7 @@ public class JlinkTask {
+ 
+     private String getSaveOpts() {
+         StringBuilder sb = new StringBuilder();
+-        sb.append('#').append(new Date()).append("\n");
++        sb.append('#').append(System.getenv("SOURCE_DATE_EPOCH") != null ? new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))) : new Date()).append("\n");
+         for (String c : optionsHelper.getInputCommand()) {
+             sb.append(c).append(" ");
+         }