diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 020dc5a3450c..a05fa0f0dd37 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.42 2011/05/11 12:46:20 obache Exp $
+# $NetBSD: Linux.mk,v 1.43 2011/08/22 15:17:53 cheusov Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -94,8 +94,9 @@ _OPSYS_CAN_CHECK_SHLIBS=	yes # use readelf in check/bsd.check-vars.mk
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-# FIXME: Adjust to work on this system and enable the lines below.
-#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
+.if exists(/usr/bin/getconf)
+_OPSYS_MAX_CMDLEN_CMD?=	/usr/bin/getconf ARG_MAX
+.endif
 
 .if (${MACHINE_ARCH} == "x86_64")
 ABI?=	64