diff --git a/CHANGES b/CHANGES
index 88a843200b91b5d734d9f5a5e1cf9f22bd06cf4b..153b3cf038665a9f8d36abcbfc30ce12bb2d3c5a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ OpenLDAP 2.4.16 Engineering
 	Fixed slapo-syncprov multiple CSN propagation (ITS#5973)
 	Fixed slapo-syncprov sending cookies without CSN (ITS#6024)
 	Fixed slapo-syncprov skipped entries with MMR (ITS#5988)
+	Fixed tools passphrase free (ITS#6014)
 	Build Environment
 		Cleaned up alloc/free functions for Windows (ITS#6005)
 		Fixed running of autosave files in testsuite (ITS#6026)
diff --git a/clients/tools/common.c b/clients/tools/common.c
index 08d36118de73a3330c0bad5b6aa773400b6ee58c..0ad5809a3e2353a67beeca7a539c7009a5daedc0 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -255,9 +255,11 @@ tool_destroy( void )
 		ber_memfree( binddn );
 	}
 
+#if 0	/* not yet */
 	if ( passwd.bv_val != NULL ) {
 		ber_memfree( passwd.bv_val );
 	}
+#endif
 }
 
 void