diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index a63b475255..0d2d5aa355 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -23,7 +23,11 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
-#ifdef SLAPD_LMHASH
+/* KPASSWD/krb.h brings in a conflicting des.h so don't use both.
+ * configure currently requires OpenSSL to enable LMHASH. Obviously
+ * this requirement can be fulfilled by the KRB DES library as well.
+ */
+#if defined(SLAPD_LMHASH) && !defined(SLAPD_KPASSWD)
 #	include <openssl/des.h>
 #endif /* SLAPD_LMHASH */