diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 9ef3f2b3d0e..0bc62f06fb7 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,13 +1,13 @@
 # Template file for 'inetutils'
 pkgname=inetutils
 version=1.9.4
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--without-wrap --with-pam"
 makedepends="pam-devel readline-devel"
 short_desc="GNU network utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/inetutils"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37
@@ -29,9 +29,16 @@ esac
 depends="${subpackages}"
 
 pre_configure() {
-	sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
+	vsed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
 	# Create a definition to allow the ifconfig program to build properly
 	echo '#define PATH_PROCNET_DEV "/proc/net/dev"' >> ifconfig/system/linux.h
+	# Use the standard name ("nicname") for the "whois" service.
+	vsed -i 's|port : "whois"|port : "nicname"|' whois/whois.c
+	# Changing the whois/whois.c triggers help2man invocation. This is not
+	# necessary because no option has changed. Moreover, launching help2man
+	# fails for the cross compilations. Let's make sure the build process
+	# is not triggered to run it then.
+	touch man/whois.1
 }
 post_install() {
 	# Keep just usr/share/info/inetutils.info.gz