diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index e186d253c6..aef935b755 100644
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -393,10 +393,12 @@ ldif_sput(
 
 	stop = (unsigned char *) (val + vlen);
 
-	if ( type == LDIF_PUT_VALUE &&
-		isgraph( val[0] ) && val[0] != ':' && val[0] != '<' &&
-		isgraph( val[vlen-1] ) )
-	{
+	if ( type == LDIF_PUT_VALUE
+		&& isgraph( val[0] ) && val[0] != ':' && val[0] != '<'
+		&& isgraph( val[vlen-1] )
+		&& strcasecmp( name, "userPassword" ) != 0	/* encode userPassword */
+		&& strcasecmp( name, "2.5.4.35" ) != 0		/* encode userPassword */
+	) {
 		int b64 = 0;
 
 		for ( byte = (unsigned char *) val; byte < stop;