diff --git a/configure.in b/configure.in
index f3b2f5dad..cb08d4c78 100644
--- a/configure.in
+++ b/configure.in
@@ -1245,14 +1245,17 @@ EL_ARG_ENABLE(CONFIG_GOPHER, gopher, [Gopher protocol],
 EL_ARG_ENABLE(CONFIG_NNTP, nntp, [NNTP protocol],
 	      [  --enable-nntp           enable nntp protocol support])
 
+dnl Force disable SMB before EL_ARG_DEPEND so that it logs the correct value.
+if test "${enable_smb-no}" != no || test "${CONFIG_SMB-no}" != no; then
+  AC_MSG_WARN([Forcing --disable-smb because of vulnerability CVE-2006-5925.
+If you want to use SMB, please vote for bug 844 or post a patch.])
+fi
+enable_smb=no
+CONFIG_SMB=no
 EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol],
 	      [  --enable-smb            not currently allowed])
-dnl	      [  --disable-smb           disable SMB protocol support (requires smbclient)])
-if test "$CONFIG_SMB" != no; then
-  AC_MSG_WARN([Ignoring --enable-smb because of vulnerability CVE-2006-5925.
-If you want to use SMB, please vote for bug 844 or post a patch.])
-  CONFIG_SMB=no
-fi
+dnl EL_ARG_DEPEND(CONFIG_SMB, smb, [HAVE_SMBCLIENT:yes], [SMB protocol],
+dnl 	      [  --disable-smb           disable SMB protocol support (requires smbclient)])
 
 
 EL_ARG_ENABLE(CONFIG_MOUSE, mouse, [Mouse handling],