diff --git a/configure.in b/configure.in
index 54a452a7a..ad08731a9 100644
--- a/configure.in
+++ b/configure.in
@@ -115,7 +115,7 @@ for i in $camlibs; do
 done
 AC_MSG_CHECKING(which drivers to compile)
 AC_ARG_WITH(drivers,
-  [  --with-drivers=<list>     compile drivers in <list>; ]
+  [  --with-drivers=<list>   compile drivers in <list>; ]
   [                            drivers may be separated with commas; ]
   [                            'all' compiles all drivers; ]
   [                            possible drivers are: ]
@@ -175,7 +175,7 @@ dnl ***
 cdk_msg=no
 try_cdk=true
 have_cdk=false
-AC_ARG_WITH(cdk, [  --without-cdk     Don't use cdk],
+AC_ARG_WITH(cdk, [  --without-cdk           Don't use cdk],
 	if test x$withval = xno; then
 		try_cdk=false
 	fi
@@ -197,7 +197,7 @@ dnl ****
 jpeg_msg=no
 try_jpeg=true
 have_jpeg=false
-AC_ARG_WITH(jpeg, [  --without-jpeg    Don't use jpeg],
+AC_ARG_WITH(jpeg, [  --without-jpeg          Don't use jpeg],
 	if test x$withval = xno; then
 		try_jpeg=false
 	fi
@@ -229,7 +229,7 @@ dnl *****
 aa_msg=no
 try_aa=true
 have_aa=false
-AC_ARG_WITH(aalib, [  --without-aalib   Don't use aalib],
+AC_ARG_WITH(aalib, [  --without-aalib         Don't use aalib],
 	if test x$withval = xno; then
 		try_aa=false
 	fi
diff --git a/libgphoto2_port/configure.in b/libgphoto2_port/configure.in
index c8734b867..6caac2b3e 100644
--- a/libgphoto2_port/configure.in
+++ b/libgphoto2_port/configure.in
@@ -86,7 +86,7 @@ lockdev_msg=no
 try_baudboy_msg=true
 try_ttylock=true
 try_lockdev=true
-AC_ARG_WITH(serial, [  --without-serial  Don't compile in SERIAL support],
+AC_ARG_WITH(serial, [  --without-serial        Don't compile in SERIAL support],
 	if test x$withval = xno; then
 		have_serial=false
 		serial_msg=no
@@ -175,7 +175,7 @@ dnl libusb
 dnl ******
 usb_msg=no
 try_usb=true
-AC_ARG_WITH(usb, [  --without-usb   Don't compile in USB support],
+AC_ARG_WITH(usb, [  --without-usb           Don't compile in USB support],
 	if test x$withval = xno; then
 		try_usb=false
 	fi
diff --git a/libgphoto2_port/m4/packaging.m4 b/libgphoto2_port/m4/packaging.m4
index 237204f98..12b3c233a 100644
--- a/libgphoto2_port/m4/packaging.m4
+++ b/libgphoto2_port/m4/packaging.m4
@@ -1,6 +1,6 @@
 AC_DEFUN(GPKG_CHECK_RPM,
 [
-AC_ARG_WITH(rpmbuild, [  --with-rpmbuild=PATH  program to use for building RPMs])
+AC_ARG_WITH(rpmbuild, [  --with-rpmbuild=PATH    program to use for building RPMs])
 
 AC_MSG_CHECKING([rpmbuild])
 if test -x "${with_doc_dir}"