diff --git a/emacs-29.1.dif b/emacs-29.1.dif
index 6bf9428..ccc6563 100644
--- a/emacs-29.1.dif
+++ b/emacs-29.1.dif
@@ -64,8 +64,8 @@
 -    LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`
 -      AS_ECHO(["$x_libraries"]) | sed -e 's/:/ -Wl,-rpath,/g'
 -    `
-+    LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
-+    LD_SWITCH_X_SITE_RPATH="-Wl,-rpath-link,${x_libraries%%:*}"
++    LD_SWITCH_X_SITE=""
++    LD_SWITCH_X_SITE_RPATH=""
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
diff --git a/emacs.changes b/emacs.changes
index 10de654..cc71330 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 15 13:53:48 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Try to avoid crash on later loaded shared libraries as seen in
+  bug boo#1234865 with libnvidia-tls.so
+
 -------------------------------------------------------------------
 Thu Jan  9 12:26:03 UTC 2025 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/emacs.spec b/emacs.spec
index 7b58c21..65087d3 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -100,7 +100,11 @@ BuildRequires:  update-desktop-files
 #BuildRequires:  xdotool
 #BuildRequires:  xorg-x11-Xvfb
 BuildRequires:  xz
+%if 0%{?suse_version} > 1550
+BuildRequires:  zlib-ng-compat-devel
+%else
 BuildRequires:  zlib-devel
+%endif
 BuildRequires:  pkgconfig(ImageMagick)
 BuildRequires:  pkgconfig(com_err)
 BuildRequires:  pkgconfig(dbus-1)
@@ -161,6 +165,7 @@ BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xwayland)
 BuildRequires:  pkgconfig(xxf86vm)
+BuildRequires:  treesitter_grammar(tree-sitter-ruby)
 URL:            http://www.gnu.org/software/emacs/
 Version:        29.4
 Release:        0
@@ -230,7 +235,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define appDefaultsDir %{_x11data}/app-defaults
 %define appDefaultsFile %{appDefaultsDir}/Emacs
 %else
+%global inodelib    %(ls -id /%{_lib}/|sed 's@ /.*@@')
+%global inodeusrlib %(ls -id %{_libdir}/|sed 's@ /.*@@')
+%if %inodelib == %inodeusrlib
+%define _x11lib     /%{_lib}
+%else
 %define _x11lib     %{_libdir}
+%endif
 %define _x11data    %{_datadir}/X11
 %define _libx11     %{_exec_prefix}/lib/X11
 %define _x11inc     %{_includedir}
@@ -462,12 +473,13 @@ VERSION=%{version}
 %endif
  CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATION_WARNINGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"
 LDFLAGS=
-  cflags -pipe                   CFLAGS
-  cflags -Wno-pointer-sign       CFLAGS
-  cflags -Wno-unused-variable    CFLAGS
-  cflags -Wno-unused-label       CFLAGS
-  cflags -fno-optimize-sibling-calls CFLAGS
-  cflags -Wl,-O2		 LDFLAGS
+  cflags -pipe                  CFLAGS
+  cflags -Wno-pointer-sign      CFLAGS
+  cflags -Wno-unused-variable   CFLAGS
+  cflags -Wno-unused-label      CFLAGS
+  cflags -fno-optimize-sibling-calls	CFLAGS
+  cflags -Wl,-O2		LDFLAGS
+  cflags -Wl,--copy-dt-needed-entries	LDFLAGS
 %ifarch ia64
  CFLAGS=$(echo "${CFLAGS}"|sed -r 's/-O[0-9]?/-O1/g')
 %endif