diff --git a/configure.ac b/configure.ac
index cceb2d6496..ff41dc7267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1055,7 +1055,7 @@ cat > conftest.cpp << EOF
 AUTOCONF_LOG4CPLUS_VERSION=LOG4CPLUS_VERSION_STR
 EOF
 
-LOG4CPLUS_VERSION=`$CPPP $CPPFLAGS conftest.cpp | grep '^AUTOCONF_LOG4CPLUS_VERSION=' | $SED -e 's/^AUTOCONF_LOG4CPLUS_VERSION=//' -e 's/[[   ]]//g' -e 's/"//g' 2> /dev/null`
+LOG4CPLUS_VERSION=`$CPPP $CPPFLAGS conftest.cpp | grep '^AUTOCONF_LOG4CPLUS_VERSION=' | $SED -e 's/^AUTOCONF_LOG4CPLUS_VERSION=//' -e 's/[[ 	]]//g' -e 's/"//g' 2> /dev/null`
 if test -z "$LOG4CPLUS_VERSION"; then
   LOG4CPLUS_VERSION="unknown"
 fi
diff --git a/m4macros/ax_crypto.m4 b/m4macros/ax_crypto.m4
index 74b4400d98..dcc2c594bb 100644
--- a/m4macros/ax_crypto.m4
+++ b/m4macros/ax_crypto.m4
@@ -205,7 +205,7 @@ EOF
         CRYPTO_LDFLAGS=""
         CRYPTO_RPATH=""
         if test "x$ac_header_preproc" = "xyes"; then
-                AC_MSG_RESULT([botan/botan.h}
+                AC_MSG_RESULT([botan/botan.h
 was found but is unusable. The most common cause of this problem
 is attempting to use an updated C++ compiler with older C++ libraries, such as
 the version of Botan that comes with your distribution. If you have updated
diff --git a/m4macros/ax_isc_rpath.m4 b/m4macros/ax_isc_rpath.m4
index 7ab0b2d48b..cf90e5380c 100644
--- a/m4macros/ax_isc_rpath.m4
+++ b/m4macros/ax_isc_rpath.m4
@@ -33,8 +33,8 @@ if test x$rpath != xno; then
 
     # check -Wl,-R and -R rather than gcc specific -rpath to be as portable
     # as possible.  -Wl,-R seems to be safer, so we try it first.  In some
-    # cases -R is not actually recognized but AC_LINK_IFELSE doesn't fail due to
-    # that.
+    # cases -R is not actually recognized but AC_LINK_IFELSE doesn't fail due
+    # to that.
     AC_MSG_CHECKING([whether -Wl,-R flag is available in linker])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
         [AC_MSG_RESULT(yes)