diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index b854233aa761..de33a7604c4f 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -18,8 +18,8 @@ CONFLICTS=	nut-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	networkupstools
-GH_TAGNAME=	e718a1e7e
-NUT_COMMIT_DATE=	2024.12.14
+GH_TAGNAME=	eb3134101
+NUT_COMMIT_DATE=	2025.03.25
 
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
@@ -38,7 +38,7 @@ CGIDIR_REL?=	${CGIDIR:S,^${PREFIX}/,,}
 PLIST_SUB+=	CGIDIR="${CGIDIR_REL}"
 PLIST_SUB+=	CGIETCDIR="etc/nut/"
 
-OPTIONS_DEFAULT=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS OPENSSL
+OPTIONS_DEFAULT=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL
 OPTIONS_DEFAULT_amd64=	FREEIPMI
 OPTIONS_DEFAULT_i386=	FREEIPMI
 OPTIONS_DEFAULT_powerpc=	FREEIPMI
@@ -46,7 +46,7 @@ OPTIONS_DEFAULT_powerpc64=	FREEIPMI
 OPTIONS_DEFAULT_powerpc64le=	FREEIPMI
 OPTIONS_DEFAULT_riscv64=	FREEIPMI
 OPTIONS_DEFAULT_riscv64sf=	FREEIPMI
-OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS DEV
+OPTIONS_DEFINE=	SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV
 OPTIONS_SINGLE=	SSL
 OPTIONS_SINGLE_SSL=	SSL_OFF OPENSSL NSS
 OPTIONS_SUB=	yes
@@ -74,6 +74,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--program-transform-name="" \
 		--localstatedir=${STATEDIR} \
 		--datadir=${PREFIX}/etc/nut \
+		--mandir=${PREFIX}/share/man/nut \
 		--with-devd-dir=${PREFIX}/etc/devd \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=${STATEDIR} \
@@ -99,6 +100,9 @@ LIB_DEPENDS+=	libltdl.so:devel/libltdl
 # XXX asciidoc.
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
+MANPAGES_CONFIGURE_ON=	--with-doc=man=auto
+MANPAGES_CONFIGURE_OFF=	--with-doc=no
+
 CGI_LIB_DEPENDS=	libgd.so:graphics/gd
 CGI_CONFIGURE_WITH=	cgi
 CGI_CONFIGURE_ON=	--with-cgipath=${CGIDIR} \
@@ -166,10 +170,8 @@ post-install:
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cables
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/man
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/man/*.txt ${STAGEDIR}${DOCSDIR}/man
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR}
 .for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/nut-devel/distinfo b/sysutils/nut-devel/distinfo
index f263729b79f0..8db67d39e468 100644
--- a/sysutils/nut-devel/distinfo
+++ b/sysutils/nut-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739942010
-SHA256 (networkupstools-nut-2024.12.14-e718a1e7e_GH0.tar.gz) = b1d242617f76077f99328867133a503c4c25c98234175d0182ac693d6329725d
-SIZE (networkupstools-nut-2024.12.14-e718a1e7e_GH0.tar.gz) = 4734374
+TIMESTAMP = 1743050540
+SHA256 (networkupstools-nut-2025.03.25-eb3134101_GH0.tar.gz) = a3bcb3af003cdcaa814e1bf07986101ec4673daf3c18d6b51b91c24620e933d4
+SIZE (networkupstools-nut-2025.03.25-eb3134101_GH0.tar.gz) = 4799885
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index 0f26aaeb80ed..183e4726d828 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -45,7 +45,7 @@ lib/libnutclient.so.2.0.2
 lib/libupsclient.a
 lib/libupsclient.so
 lib/libupsclient.so.6
-lib/libupsclient.so.6.0.1
+lib/libupsclient.so.6.0.2
 lib/libnutclientstub.a
 lib/libnutclientstub.so
 lib/libnutclientstub.so.1
@@ -60,6 +60,7 @@ lib/libnutscan.so.2.0.6
 %%DEV%%libdata/pkgconfig/libnutscan.pc
 %%DEV%%libdata/pkgconfig/libupsclient.pc
 %%DEV%%libdata/pkgconfig/libnutclientstub.pc
+%%DEV%%libexec/sockdebug
 %%SERIAL%%libexec/nut/al175
 %%SERIAL%%libexec/nut/apcupsd-ups
 %%USB%%libexec/nut/nutdrv_atcl_usb
@@ -124,7 +125,176 @@ lib/libnutscan.so.2.0.6
 %%MODBUS%%libexec/nut/phoenixcontact_modbus
 %%MODBUS%%libexec/nut/socomec_jbus
 %%SERIAL%%libexec/nut/victronups
-%%DEV%%libexec/sockdebug
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_commands.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_devices.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_general.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_misc.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_tcp.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_variables.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_authenticate.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_destroy.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_forced_shutdown.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_login.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_master.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_execute_device_command.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_command_description.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_commands.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_description.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_num_logins.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_rw_variables.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variable_description.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variable_values.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variables.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_devices.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device_command.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device_variable.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_logout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_set_device_variable_value.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_set_device_variable_values.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_create_client.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_disconnect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_get_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_is_connected.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_reconnect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_set_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_ip_range.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_parsable.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check_serial.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_ip_ranges.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_get_serial_ports_list.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init_ip_ranges.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_inc.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_new_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_avahi.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_ipmi.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut_simulation.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_stringify_ip_ranges.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_add_host_cert.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_cleanup.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_connect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_disconnect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_fd.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_get.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_next.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_start.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitaddr.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitname.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_add_unique_token.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_contains_token.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_strerror.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upserror.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upsclient.3.gz
+%%MANPAGES%%share/man/man5/nut.conf.5.gz
+%%MANPAGES%%share/man/man5/ups.conf.5.gz
+%%MANPAGES%%share/man/man5/upsd.conf.5.gz
+%%MANPAGES%%share/man/man5/upsd.users.5.gz
+%%MANPAGES%%share/man/man5/upsmon.conf.5.gz
+%%MANPAGES%%share/man/man5/upssched.conf.5.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/al175.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/apcupsd-ups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/blazer_ser.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/blazer_usb.8.gz
+%%MANPAGES%%%%NEON%%share/man/man8/netxml-ups.8.gz
+%%MANPAGES%%share/man/man8/nut-driver-enumerator.8.gz
+%%MANPAGES%%share/man/man8/nut-recorder.8.gz
+%%MANPAGES%%share/man/man8/nut-scanner.8.gz
+%%MANPAGES%%share/man/man8/nutconf.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz
+%%MANPAGES%%share/man/man8/nutupsdrv.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/huawei-ups2000.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/phoenixcontact_modbus.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/socomec_jbus.8.gz
+%%MANPAGES%%share/man/man8/upsc.8.gz
+%%MANPAGES%%share/man/man8/upscmd.8.gz
+%%MANPAGES%%share/man/man8/upsd.8.gz
+%%MANPAGES%%share/man/man8/upsdrvctl.8.gz
+%%MANPAGES%%share/man/man8/upsdrvsvcctl.8.gz
+%%MANPAGES%%share/man/man8/upslog.8.gz
+%%MANPAGES%%share/man/man8/upsmon.8.gz
+%%MANPAGES%%share/man/man8/upsrw.8.gz
+%%MANPAGES%%share/man/man8/upssched.8.gz
+%%MANPAGES%%%%CGI%%share/man/man5/hosts.conf.5.gz
+%%MANPAGES%%%%CGI%%share/man/man5/upsset.conf.5.gz
+%%MANPAGES%%%%CGI%%share/man/man5/upsstats.html.5.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsset.cgi.8.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsstats.cgi.8.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsimage.cgi.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart-old.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestfortress.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bcmxcp.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/belkin.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/belkinunv.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestuferrups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestfcom.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/clone.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/dummy-ups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/etapro.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/everups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/gamatronic.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/genericups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/isbmex.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/ivtscd.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/liebert.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-esp2.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/masterguard.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/metasys.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/mge-shut.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/mge-utalk.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/microdowell.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/microsol-apc.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/oneac.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/optiups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/powercom.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/powerpanel.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/rhino.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/safenet.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/solis.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/tripplite.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/tripplitesu.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/upscode2.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/victronups.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/bcmxcp_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/richcomm_usb.8.gz
+%%MANPAGES%%%%DEV%%share/man/man8/sockdebug.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/tripplite_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/usbhid-ups.8.gz
+%%MANPAGES%%%%SNMP%%share/man/man8/snmp-ups.8.gz
+%%MANPAGES%%%%IPMIPSU%%share/man/man8/nut-ipmipsu.8.gz
+%%MANPAGES%%%%PDU%%share/man/man8/powerman-pdu.8.gz
 sbin/upsd
 sbin/upsdrvctl
 sbin/upsmon