diff --git a/devel/libltdl/pkg-plist b/devel/libltdl/pkg-plist
index e16d56804daf..82500df89bb6 100644
--- a/devel/libltdl/pkg-plist
+++ b/devel/libltdl/pkg-plist
@@ -1,9 +1,9 @@
 include/libltdl/lt_dlloader.h
 include/libltdl/lt_error.h
 include/libltdl/lt_system.h
 include/ltdl.h
 lib/libltdl.a
 lib/libltdl.la
 lib/libltdl.so
 lib/libltdl.so.7
-lib/libltdl.so.7.3.2
+lib/libltdl.so.7.3.3
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 77629fdaead2..f0d65e761860 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	libtool
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Generic shared library support script
 WWW=		https://www.gnu.org/software/libtool/
 
 .include "${.CURDIR}/../libtool/Makefile.common"
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gm4:devel/m4
 RUN_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-ltdl-install
 TEST_TARGET=	check
 
 NO_ARCH=	yes
 INFO=		libtool
 
 .if "${CC}" == "/nxb-bin/usr/bin/cc"
 # Generate libtool script for the native compiler, not the cross compiler.
 CC=		cc
 CXX=		c++
 LD=		ld
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index e819193d5805..5bcc61afe468 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,14 +1,14 @@
-PORTVERSION=	2.4.7
+PORTVERSION=	2.5.4
 PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
 CATEGORIES=	devel
 MASTER_SITES=	GNU/libtool
 DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	tijl@FreeBSD.org
 
 USES=		cpe gmake tar:xz
 
 CPE_VENDOR=	gnu
 CPE_PRODUCT=	libtool
 
 DISTINFO_FILE=	${.CURDIR}/../libtool/distinfo
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 6a90e9d8d11c..2d7b73291539 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649420958
-SHA256 (libtool-2.4.7.tar.xz) = 4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d
-SIZE (libtool-2.4.7.tar.xz) = 1016040
+TIMESTAMP = 1734954115
+SHA256 (libtool-2.5.4.tar.xz) = f81f5860666b0bc7d84baddefa60d1cb9fa6fceb2398cc3baca6afaa60266675
+SIZE (libtool-2.5.4.tar.xz) = 1056924
diff --git a/devel/libtool/files/patch-tests_testsuite b/devel/libtool/files/patch-tests_testsuite
deleted file mode 100644
index bd223f4dd39f..000000000000
--- a/devel/libtool/files/patch-tests_testsuite
+++ /dev/null
@@ -1,20 +0,0 @@
---- tests/testsuite.orig	2022-03-17 02:45:47 UTC
-+++ tests/testsuite
-@@ -8737,7 +8737,7 @@ at_xfail=no
- 
- { set +x
- $as_echo "$at_srcdir/demo.at:513: case \$host in
--hppa*|x86_64*|s390*)
-+hppa*|amd64*|x86_64*|s390*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)
-@@ -8762,7 +8762,7 @@ fi
- "
- at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:513"
- ( $at_check_trace; case $host in
--hppa*|x86_64*|s390*)
-+hppa*|amd64*|x86_64*|s390*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)