diff --git a/CHANGES b/CHANGES
index 8591687b22b8f17de1bdea5ae77badc823c0c610..3002c1de95b472e56e8e5f219165346f315649f0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.19 Release (2009/10/03)
 	Fixed slapo-sssvlv sort control dereferencing (ITS#6288)
 	Fixed contrib/autogroup segfaults (ITS#6279)
 	Fixed contrib/nssov getgroupbymembers (ITS#6291)
+	Fixed contrib/smbk5pwd rpath linking (ITS#6323)
 	Build Environment
 		Fixed --enable-deref support (ITS#6311)
 		Fixed contrib/autogroup default libtool path (ITS#6284)
diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
index 67c056a27c458a3f6e17f587b80a628d7cc75558..14e0c5350d978ef746b926d9a5ff34515adce4a6 100644
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -45,7 +45,7 @@ smbk5pwd.lo:	smbk5pwd.c
 
 smbk5pwd.la:	smbk5pwd.lo
 	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-	-rpath $(libdir) -module -o $@ $? $(LIBS)
+	-rpath $(moduledir) -module -o $@ $? $(LIBS)
 
 clean:
 	rm -f smbk5pwd.lo smbk5pwd.la