diff --git a/security/heimdal/heimdal.conf b/security/heimdal/heimdal.conf
index 8b740e300..7307b45f0 100644
--- a/security/heimdal/heimdal.conf
+++ b/security/heimdal/heimdal.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../heimdal/heimdal.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -22,12 +22,12 @@ localstatedir=/var/heimdal
 var_insert CC_WRAPPER_INSERT " " "-D_REENTRANT"
 
 if atstage native; then
-	if pkginstalled openssl; then
+	if pkginstalled -f openssl; then
 		pkgprefix -t openssl
 		var_append extraconfopt ' ' "--with-openssl=$( pkgprefix sysconfdir openssl )"
 	fi
 
-	if [ "$SDECFG_PKG_HEIMDAL_LDAP" = "1" ]; then
+	if [ "$SDECFG_PKG_HEIMDAL_LDAP" = "1" ] && pkginstalled -f openldap; then
 		pkgprefix -t openldap
 		var_append extraconfopt ' ' "--with-openldap=/$( pkgprefix openldap )"
 		[ "$SDECFG_PKG_OPENLDAP_CLIENTONLY" = "0" ] && \