diff --git a/sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe b/sys-devel/avr_binutils/avr_binutils-2.40.recipe
similarity index 85%
rename from sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe
rename to sys-devel/avr_binutils/avr_binutils-2.40.recipe
index 0db1fffef..04ccb6c04 100644
--- a/sys-devel/avr_binutils/avr_binutils-2.26.1_2016_07_22.recipe
+++ b/sys-devel/avr_binutils/avr_binutils-2.40.recipe
@@ -20,15 +20,13 @@ But they also include:
 
 The tools of this package can be used for cross-builds to Atmel AVR."
 HOMEPAGE="https://www.gnu.org/software/binutils"
-COPYRIGHT="1988-2016 Free Software Foundation, Inc."
+COPYRIGHT="1988-2023 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="5"
-srcGitRev="68e96393c7be88bc0e577404869a07ad3c0b48b3"
-SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="95743a550c7e2b561273a1e349a270c659b0c454209de9cd7fc105395fec66fd"
-SOURCE_DIR="buildtools-$srcGitRev/binutils"
-SOURCE_FILENAME="binutils-$portVersion.tar.gz"
+REVISION="1"
+SOURCE_URI="https://ftp.gnu.org/gnu/binutils/binutils-$portVersion.tar.xz"
+SOURCE_DIR="binutils-$portVersion"
+CHECKSUM_SHA256="0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -53,6 +51,12 @@ PROVIDES="
 	cmd:avr_strip = $portVersion compat >= 2.23
 	lib:avr_libbfd_$portVersion = $portVersion compat >= 2.23
 	lib:avr_libopcodes_$portVersion = $portVersion compat >= 2.23
+	lib:libctf_nobfd = 0.0.0 compat >= 0
+	lib:libctf = 0.0.0 compat >= 0
+	lib:libsframe = 0.0.0 compat >= 0
+	devel:libctf_nobfd = 0.0.0 compat >= 0
+	devel:libctf = 0.0.0 compat >= 0
+	devel:libsframe = 0.0.0 compat >= 0
 	"
 
 REQUIRES="
@@ -67,6 +71,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:awk
+	cmd:bison
 	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
@@ -90,12 +95,6 @@ BUILD()
 {
 	rm -rf $objectsDir
 
-	# Touch all *.info files, as newer texinfos don't like their format
-	(cd $sourceDir; find . -name \*.info | xargs touch)
-
-	(cd $sourceDir; find . -name \*.y | sed 's/.y$/.c/g' | xargs touch)
-    (cd $sourceDir; find . -name \*.y | sed 's/.y$/.h/g' | xargs touch)
-
 	mkdir -p $objectsDir
 	cd $objectsDir
 
@@ -144,4 +143,7 @@ INSTALL()
 	for cmd in dlltool nlmconv windmc windres; do
 		rm -f man1/$cmd.1
 	done
+
+	rm $libDir/*.la $libDir/*.a
+	prepareInstalledDevelLibs libctf libsframe
 }