diff --git a/CHANGES b/CHANGES
index 63b4c20d31188d374d13d8a46f8f6e4f0250d124..d037893c4068c417dfa66f8eae94e7ed3a5d0020 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.24 Engineering
 	Fixed liblber to not close invalid sockets (ITS#6585)
+	Fixed libldap dnssrv port format specifier (ITS#6644)
 	Fixed ldapsearch segfault with deref (ITS#6638)
 	Fixed slapd acl parsing overflow (ITS#6611)
 	Fixed slapd modify to return actual error (ITS#6581)
diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 8c5051d13b1fcbf68cb1fc0d4cc50f4b747f22c0..3d88c80bd0da716a906303b0ef894afadb314abe 100644
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -289,7 +289,7 @@ int ldap_domain2hostlist(
 		    /* not first time around */
 		    hostlist[cur++] = ' ';
 		}
-		cur += sprintf(&hostlist[cur], "%s:%hd", host, port);
+		cur += sprintf(&hostlist[cur], "%s:%hu", host, port);
 	    }
 add_size:;
 	    p += size;