diff --git a/configure.ac b/configure.ac
index 67566fc..0d1f16d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,8 @@
 
 # Make it possible for users to choose if they want test support
 # explicitly or not at all
-AC_ARG_ENABLE([tests], [Whether we should build test cases])
+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],
+                                      [Build test cases]))
 
 # Check/set gtest specific functions.
 AS_IF([test "x$enable_tests" != "xno"], [
@@ -142,7 +143,7 @@
 # Append -Werror after doing autoconf compiler checks
 # Otherwise some perfectly valid checks can fail and cause our
 # final configuratin to be broken.
-AC_ARG_ENABLE([werror], [Whether to automatically add -Werror CFLAGS])
+AC_ARG_ENABLE([werror], AC_HELP_STRING([--disable-werror], [Whether to automatically add -Werror CFLAGS]))
 AS_IF([test "x$enable_tests" != "xno"], [
     AX_APPEND_COMPILE_FLAGS([-Werror], [CFLAGS])
     AX_APPEND_COMPILE_FLAGS([-Werror], [CXXFLAGS])