diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 881800a..5a5cac3 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -328,7 +328,7 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        12
-%global rpmrelease      2
+%global rpmrelease      3
 # 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
@@ -1781,6 +1781,16 @@ done
 done
 
 %build
+# we need to symlink sources to expected lcoation, so debuginfo strip can locate debugsources
+src_image=`ls -d %{compatiblename}*%{version}*portable.sources.noarch`
+ln -s $src_image/%{vcstag} %{vcstag} # this one shpuld be enoug
+# cpio is complaining baout several files from build dir. Attempt here, but seems not to be correct
+# as those sources are generated during build and so it have to be fixed in portables first
+mkdir build
+cd build
+ln -s ../$src_image/%{vcstag}/src jdk21.build
+ln -s ../$src_image/%{vcstag}/src jdk21.build-fastdebug
+ln -s ../$src_image/%{vcstag}/src jdk21.build-slowdebug
 
 %install
 function installjdk() {
@@ -2392,6 +2402,13 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Wed Nov 22 2023 Jiri Vanek <jvanek@redhat.com> - 1:21.0.1.0.12-3.rolling
+- proeprly filing debugsources pkg
+  by addedd symlinks restructuring the structure for original build sources
+- according to logs, some are still missing
+  probably generated during the build, and thus not existing in prep,
+  when the sources subpkg is created after patching
+
 * Wed Nov 22 2023 Jiri Vanek <jvanek@redhat.com> - 1:21.0.1.0.12-2.rolling
 - added setup and thus enabled debuginfo strip
 - note, that debugsources are now empty. Symlink from full sourcess to build/jdk21.build or build/vcstag is needed