diff --git a/configure.ac b/configure.ac
index aa84ee5..747a0c6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -225,7 +225,7 @@
 	AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
 	[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
 AC_ARG_ENABLE(vtysh,
-  AS_HELP_STRING([--enable-vtysh], [include integrated vty shell for Quagga]))
+  AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for Quagga]))
 AC_ARG_ENABLE(doc,
   AS_HELP_STRING([--disable-doc], [do not build docs]))
 AC_ARG_ENABLE(zebra,
@@ -245,7 +245,7 @@
 AC_ARG_ENABLE(isisd,
   AS_HELP_STRING([--disable-isisd], [do not build isisd]))
 AC_ARG_ENABLE(pimd,
-  AS_HELP_STRING([--enable-pimd], [build pimd]))
+  AS_HELP_STRING([--disable-pimd], [do not build pimd]))
 AC_ARG_ENABLE(bgp-announce,
   AS_HELP_STRING([--disable-bgp-announce,], [turn off BGP route announcement]))
 AC_ARG_ENABLE(snmp,
@@ -637,7 +637,8 @@
 dnl Integrated VTY option
 dnl ---------------------
 case "${enable_vtysh}" in
-  "yes") VTYSH="vtysh";
+  "no") VTYSH="";;
+  *)    VTYSH="vtysh";
          AC_DEFINE(VTYSH,,VTY shell)
 dnl	 Vtysh uses libreadline, which looks for termcap functions at
 dnl	 configure time.  We follow readlines search order.
@@ -667,7 +668,6 @@
 	 fi
 	 ;;
   "no" ) VTYSH="";;
-  *    ) ;;
 esac
 AC_SUBST(LIBREADLINE)
 AM_CONDITIONAL(VTYSH, test "x$VTYSH" = "xvtysh")
@@ -1186,9 +1186,8 @@
 AM_CONDITIONAL(ISISD, test "x$ISISD" = "xisisd")
 
 case "${enable_pimd}" in
-  "yes") PIMD="pimd";;
   "no" ) PIMD="";;
-  *    ) ;;
+  *    ) PIMD="pimd";;
 esac
 AM_CONDITIONAL(PIMD, test "x$PIMD" = "xpimd")