diff --git a/cf/krb-bigendian.m4 b/cf/krb-bigendian.m4
index b1e349e7b..e238e69ed 100644
--- a/cf/krb-bigendian.m4
+++ b/cf/krb-bigendian.m4
@@ -9,10 +9,10 @@ dnl it when cross-compiling
 
 AC_DEFUN(KRB_C_BIGENDIAN, [
 AC_ARG_ENABLE(bigendian,
-[  --enable-bigendian	the target is big endian],
+	AC_HELP_STRING([--enable-bigendian],[the target is big endian]),
 krb_cv_c_bigendian=yes)
 AC_ARG_ENABLE(littleendian,
-[  --enable-littleendian	the target is little endian],
+	AC_HELP_STRING([--enable-littleendian],[the target is little endian]),
 krb_cv_c_bigendian=no)
 AC_CACHE_CHECK(whether byte order is known at compile time,
 krb_cv_c_bigendian_compile,
diff --git a/cf/mips-abi.m4 b/cf/mips-abi.m4
index 12044dd7a..cfa1ff525 100644
--- a/cf/mips-abi.m4
+++ b/cf/mips-abi.m4
@@ -6,7 +6,7 @@ dnl value.
 
 AC_DEFUN(AC_MIPS_ABI, [
 AC_ARG_WITH(mips_abi,
-[  --with-mips-abi=abi     ABI to use for IRIX (32, n32, or 64)])
+	AC_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
 
 case "$host_os" in
 irix*)
diff --git a/cf/osfc2.m4 b/cf/osfc2.m4
index a83fc577a..f5a45ce46 100644
--- a/cf/osfc2.m4
+++ b/cf/osfc2.m4
@@ -4,7 +4,7 @@ dnl enable OSF C2 stuff
 
 AC_DEFUN(AC_CHECK_OSFC2,[
 AC_ARG_ENABLE(osfc2,
-[  --enable-osfc2          enable some OSF C2 support])
+	AC_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
 LIB_security=
 if test "$enable_osfc2" = yes; then
 	AC_DEFINE(HAVE_OSFC2, 1, [Define to enable basic OSF C2 support.])
diff --git a/cf/roken.m4 b/cf/roken.m4
index e2c87efa2..28cc86f33 100644
--- a/cf/roken.m4
+++ b/cf/roken.m4
@@ -10,7 +10,7 @@ dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppfla
 AC_DEFUN(AC_ROKEN, [
 
 AC_ARG_WITH(roken,
-[  --with-roken=dir	use the roken library in dir],
+	AC_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
 [if test "$withval" = "no"; then
   AC_MSG_ERROR(roken is required)
 fi])
diff --git a/cf/test-package.m4 b/cf/test-package.m4
index bd38e4e2a..8cf3bfed2 100644
--- a/cf/test-package.m4
+++ b/cf/test-package.m4
@@ -1,21 +1,22 @@
 dnl $Id$
 dnl
-dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,
+dnl			default locations, conditional, config-program)
 
 AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
 
 AC_DEFUN(AC_TEST_PACKAGE_NEW,[
 AC_ARG_WITH($1,
-[  --with-$1=dir                use $1 in dir])
+	AC_HELP_STRING([--with-$1=dir],[use $1 in dir]))
 AC_ARG_WITH($1-lib,
-[  --with-$1-lib=dir            use $1 libraries in dir],
+	AC_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-lib])
 elif test "X$with_$1" = "X"; then
   with_$1=yes
 fi])
 AC_ARG_WITH($1-include,
-[  --with-$1-include=dir        use $1 headers in dir],
+	AC_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-include])
 elif test "X$with_$1" = "X"; then