diff --git a/ChangeLog b/ChangeLog
index a47152eeff..b2e3f56c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-13  Derek Atkins  <derek@ihtfp.com>
+
+	* configure.in: force-enable hbci if the user enables mt940
+
 2006-06-13  David Hampton  <hampton@employees.org>
 
 	* src/quotes/gnc-fq-helper.in: Tell gnucash that a currency quote
diff --git a/configure.in b/configure.in
index 2c6ffb2c2f..c75337b106 100644
--- a/configure.in
+++ b/configure.in
@@ -785,7 +785,8 @@ AC_SUBST(OFX_DIR)
 AC_ARG_ENABLE( mt940,
   [  --enable-mt940               compile with MT940 support (needs --enable-hbci)],
   if test "x$enableval" != "xno" ; then
-    MT940_DIR=mt940
+    MT940_DIR=mt940 ;
+    HBCI_DIR=hbci ;
   fi)
 if test x${MT940_DIR} = xmt940 ;
 then