diff --git a/network/openldap/openldap.conf b/network/openldap/openldap.conf
index ce804c5b8..cd9083bb1 100644
--- a/network/openldap/openldap.conf
+++ b/network/openldap/openldap.conf
@@ -1,8 +1,8 @@
-#!/bin/sh
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: package/.../openldap/openldap.conf
+# Filename: package/.../openldap/openldap.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 # 
@@ -12,7 +12,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 
 createdocs=0
 
diff --git a/network/openldap/parse-config b/network/openldap/parse-config
index 3b26f005e..5e2cf526c 100644
--- a/network/openldap/parse-config
+++ b/network/openldap/parse-config
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
 # Filename: package/.../openldap/parse-config
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2007 The OpenSDE Project
 # 
 # More information can be found in the files COPYING and README.
 # 
@@ -12,7 +12,15 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-# FIXME! lib64 tweak - should be removed if we have proper symlinks  
 if [ -f "$root/var/adm/packages/openldap" ] ; then
+	# FIXME! lib64 tweak - should be removed if we have proper symlinks  
 	[[ $libdir == *lib ]] || var_append GCC_WRAPPER_APPEND ' ' "-L$root$( pkgprefix libdir openldap )"
+
+	if hasflag LDAP-QUIRK; then
+		echo_warning "Injecting -L and -I to find openldap as requested."
+
+		pkgprefix -t openldap
+		var_append GCC_WRAPPER_APPEND ' ' "-L$root$( pkgprefix libdir openldap )"
+		var_append GCC_WRAPPER_APPEND ' ' "-I$root$( pkgprefix includedir openldap )"
+	fi
 fi