diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index d6cab83..60cce92 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -3,7 +3,7 @@ dnl autoconf for ipmitool
 dnl
 AC_INIT([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.6.0pre4])
+AM_INIT_AUTOMAKE([ipmitool], [1.6.0pre5])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_PREREQ(2.50)
@@ -84,15 +84,15 @@ AC_CHECK_LIB([crypto], [EVP_aes_128_cbc],
 AC_CHECK_LIB([crypto], [MD5_Init],
 	[if test "x$have_crypto" != "xyes"; then
 	    LIBS="$LIBS -lcrypto"
-	    have_crypto=yes
+	    have_md5=yes
 	fi
 	AC_DEFINE(HAVE_CRYPTO_MD5, [1], [Define to 1 if libcrypto supports MD5.])],
 	[], [-lcrypto])
 
 AC_CHECK_LIB([crypto], [MD2_Init],
-	[if test "x$have_crypto" != "xyes"; then
+	[if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
 	    LIBS="$LIBS -lcrypto"
-	    have_crypto=yes
+	    have_md2=yes
 	fi
 	AC_DEFINE(HAVE_CRYPTO_MD2, [1], [Define to 1 if libcrypto supports MD2.])],
 	[], [-lcrypto])	
@@ -102,6 +102,9 @@ AC_ARG_ENABLE([intf-lan],
 	[AC_HELP_STRING([--enable-intf-lan],
 			[enable IPMIv1.5 LAN interface [default=yes]])],
 	[], [enable_intf_lan=yes])
+if test "x$enable_intf_lan" = "xstatic" || test "x$enable_intf_lan" = "xplugin"; then
+   enable_intf_lan=yes
+fi
 if test "x$enable_intf_lan" = "xyes"; then
     AC_DEFINE(IPMI_INTF_LAN, [1], [Define to 1 to enable LAN IPMIv1.5 interface.])
     AC_SUBST(INTF_LAN, [lan])
@@ -118,6 +121,9 @@ AC_ARG_ENABLE([intf-lanplus],
 	    enable_intf_lanplus=no
 	fi],
 	[enable_intf_lanplus=$have_crypto])
+if test "x$enable_intf_lanplus" = "xstatic" || test "x$enable_intf_lanplus" = "xplugin"; then
+   enable_intf_lanplus=yes
+fi
 if test "x$enable_intf_lanplus" = "xyes"; then
     AC_DEFINE(IPMI_INTF_LANPLUS, [1], [Define to 1 to enable LAN+ IPMIv2 interface.])
     AC_SUBST(INTF_LANPLUS, [lanplus])
@@ -152,6 +158,9 @@ AC_ARG_ENABLE([intf-open],
 	[AC_HELP_STRING([--enable-intf-open],
 			[enable Linux OpenIPMI interface [default=yes]])],
 	[], [enable_intf_open=yes])
+if test "x$enable_intf_open" = "xstatic" || test "x$enable_intf_open" = "xplugin"; then
+   enable_intf_open=yes
+fi
 if test "x$enable_intf_open" = "xyes"; then
     AC_DEFINE(IPMI_INTF_OPEN, [1], [Define to 1 to enable Linux OpenIPMI interface.])
     AC_SUBST(INTF_OPEN, [open])
@@ -164,6 +173,9 @@ AC_ARG_ENABLE([intf-imb],
 	[AC_HELP_STRING([--enable-intf-imb],
 			[enable Intel IMB driver interface [default=yes]])],
 	[], [enable_intf_imb=yes])
+if test "x$enable_intf_imb" = "xstatic" || test "x$enable_intf_imb" = "xplugin"; then
+   enable_intf_imb=yes
+fi
 if test "x$enable_intf_imb" = "xyes"; then
     AC_DEFINE(IPMI_INTF_IMB, [1], [Define to 1 to enable Intel IMB interface.])
     AC_SUBST(INTF_IMB, [imb])
@@ -181,6 +193,9 @@ AC_ARG_ENABLE([intf-lipmi],
 	    enable_intf_lipmi=no
 	fi],
 	[enable_intf_lipmi=$have_lipmi])
+if test "x$enable_intf_lipmi" = "xstatic" || test "x$enable_intf_lipmi" = "xplugin"; then
+   enable_intf_lipmi=yes
+fi
 if test "x$enable_intf_lipmi" = "xyes"; then
     AC_DEFINE(IPMI_INTF_LIPMI, [1], [Define to 1 to enable Solaris LIPMI interface.])
     AC_SUBST(INTF_LIPMI, [lipmi])