diff --git a/binutils.spec b/binutils.spec
index caf57ad..7defdcf 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,7 +2,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?_with_debug:-debug}
 Version: 2.35.2
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -822,9 +822,11 @@ build()
 	       --enable-gold=default"
     else
 	TARGS=""
-	SARGS="--with-sysroot=%{_prefix}/$target/sys-root \
+	SARGS="--with-sysroot=yes \
                --program-prefix=$target- \
                --prefix=%{_prefix}/$target \
+               --libdir=%{_libdir} \
+               --exec-prefix=%{_usr} \
 	       --disable-gold"
     fi
 
@@ -1077,27 +1079,6 @@ EOH
 	local target_root=$local_root/$target
 	
 	%make_install DESTDIR=%{buildroot} MAKEINFO=true
-	
-	# For cross-binutils we drop the documentation.
-	rm -rf $local_infodir/$target
-	rm -rf $local_mandir/$target
-	# And the libiberty library
-	rm -f $local_libdir/libiberty.a
-	# Remove libtool files, which reference the .so libs
-	rm -f $local_libdir/lib{bfd,opcodes}.la
-
-	install $target_root/bin/$target-ld.*  $local_bindir
-	install $target_root/bin/$target-[!l]* $local_bindir
-	pushd $local_bindir
-	ln -s   $target-ld.bfd   $target-ld
-	popd
-	rm      $target_root/bin/$target-*
-
-	# Also install the binaries into the sysroot.
-        mv      $target_root               $local_root/fred
-	mv      $local_root/fred/$target   $target_root
-	mv      $local_root/fred/share     $target_root/share
-	rm -fr  $local_root/fred
     fi
 
     # This one comes from gcc
@@ -1227,10 +1208,7 @@ exit 0
 %{_libdir}/lib*.so*
 %exclude %{_libdir}/libbfd.so
 %exclude %{_libdir}/libopcodes.so
-%exclude %{_libdir}/libctf.a
-%exclude %{_libdir}/libctf-nobfd.a
-%exclude %{_libdir}/libctf.la
-%exclude %{_libdir}/libctf-nobfd.la
+%exclude %{_libdir}/libctf*.*a
 %endif
 
 %if %{with gold}
@@ -1274,6 +1252,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Mon Dec 19 2022 Nick Clifton  <nickc@redhat.com> - 2.35.2-33
+- Restore libiberty.a to the binutils-devel package.  (#2154772)
+
 * Wed Dec 14 2022 Nick Clifton  <nickc@redhat.com> - 2.35.2-32
 - Fix special case of previous delta for s390x.   (#2151938)
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 85710d6..3fd3ab7 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,5 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
 execute:
     how: tmt