diff --git a/binutils-2.43-branch.diff.gz b/binutils-2.43-branch.diff.gz
index 94ed082..149dd9e 100644
--- a/binutils-2.43-branch.diff.gz
+++ b/binutils-2.43-branch.diff.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cc9d2257fb5fd6ab8daeebf9fffa4b76fd7dfc4717a62ba9e43f4f020fcfc8b
-size 60163
+oid sha256:6d541618e25f85bf7207ffa30b4ebb60448b50cf46c2572dedd82bc3971b4ea7
+size 57614
diff --git a/binutils-fix-branch.diff b/binutils-fix-branch.diff
new file mode 100644
index 0000000..6e410eb
--- /dev/null
+++ b/binutils-fix-branch.diff
@@ -0,0 +1,22 @@
+This is used to manually patch the bison generated files when
+the binutils-X.YZ-branch.diff touches them.  That diff is generated
+directly from git and doesn't contain the generated .c/h files.
+The base tarball does contain them, but generated from the unpatched state.
+In SLE12 and older we can't regenerate them due to too old versions
+of flex and bison.
+So, when the branch diff _does_ touch them we need to do the regeneration
+via such a manual patch.
+Index: binutils-2.43/ld/ldgram.c
+===================================================================
+--- binutils-2.43.orig/ld/ldgram.c	2024-08-04 01:00:00.000000000 +0200
++++ binutils-2.43/ld/ldgram.c	2024-12-09 16:41:08.089715376 +0100
+@@ -2839,7 +2839,7 @@ yyreduce:
+ 
+   case 73: /* ifile_p1: SEARCH_DIR '(' filename ')'  */
+ #line 324 "ldgram.y"
+-                { ldfile_add_library_path ((yyvsp[-1].name), search_dir_linker_script); }
++                { ldfile_add_library_path ((yyvsp[-1].name), false); }
+ #line 2844 "ldgram.c"
+     break;
+ 
+
diff --git a/binutils.changes b/binutils.changes
index 204b42e..c1a5f03 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -6,6 +6,11 @@ Mon Dec  9 14:49:46 UTC 2024 - Michael Matz <matz@suse.com>
   * various fixes from upstream: PR32153, PR32171, PR32189,
     PR32196, PR32191, PR32109, PR32372, PR32387
 - Adjusted binutils-2.43-branch.diff.gz.
+- Disable zstd-by-default again (needs adjustments in at least
+  golang,llvm15,llvm17 first)
+- Add binutils-fix-branch.diff.
+- Check non-changing of flex/bison inputs only after applying
+  branch and fix-branch diffs.
 
 -------------------------------------------------------------------
 Wed Nov 20 14:59:28 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
diff --git a/binutils.spec b/binutils.spec
index 985f183..b099b61 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -132,6 +132,7 @@ Source2:        binutils-%{version}.tar.bz2.sig
 Source3:        binutils.keyring
 Source4:        baselibs.conf
 Patch1:         binutils-2.43-branch.diff.gz
+Patch2:         binutils-fix-branch.diff
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -244,13 +245,18 @@ The next generation profiling tool for Linux
 echo "make check will return with %{make_check_handling} in case of testsuite failures."
 %setup -q -n binutils-%{version}
 
-# Backup flex and biscon files for later verification.
-cp ld/ldlex.l ld/ldlex.l.orig
-cp ld/ldgram.y ld/ldgram.y.orig
-
 # Patch is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
 %patch -P 1 -p1
+%patch -P 2 -p1
+
+# Backup flex and biscon files for later verification.  Do this
+# after branch and fix-branch patches are applied (which are assumed
+# to manual fixup generated files, in case the branch diff touches
+# the flex/bison source files)
+cp ld/ldlex.l ld/ldlex.l.orig
+cp ld/ldgram.y ld/ldgram.y.orig
+
 %if !%{test_vanilla}
 %patch -P 3 -p1
 %patch -P 4
@@ -379,9 +385,6 @@ cd build-dir
 %endif
 	--enable-colored-disassembly \
 %endif
-%if %{suse_version} > 1600
-  --enable-default-compressed-debug-sections-algorithm=zstd \
-%endif
 %if ! %build_gprofng
 	--disable-gprofng \
 %endif
@@ -389,6 +392,12 @@ cd build-dir
 	--enable-warn-execstack=yes \
 	--enable-warn-rwx-segments=yes
 
+# FIXME: enable in future, when at least llvm15,llvm17,golang are
+# fixed to accept zstd
+#%if %{suse_version} > 1600
+#  --enable-default-compressed-debug-sections-algorithm=zstd \
+#%endif
+
 # we patch headers (bfd-in.h) that are input to other headers
 # which are generated only with --enable-maintainer-mode (which we
 # don't do) or explicitely by make headers, so do this: