Index: Makefile
===================================================================
--- Makefile	(revision 521237)
+++ Makefile	(working copy)
@@ -32,6 +32,8 @@
 
 OPENSSL_DESC=	Enable openssl - allows use of CHALLENGE and encrypted links
 
+INSTALL_TARGET=	install-strip
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -44,4 +46,7 @@
 	--datarootdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
 	--localstatedir=/var
 
+post-install:
+	@${MV} ${STAGEDIR}${PREFIX}/bin/mkpasswd ${STAGEDIR}${PREFIX}/bin/ircd-mkpasswd
+
 .include <bsd.port.mk>
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 521237)
+++ files/pkg-message.in	(working copy)
@@ -4,6 +4,9 @@
 ircd-hybrid has now been installed.
 
 *** IMPORTANT: ***
+mkpasswd has been renamed to ircd-mkpasswd to avoid conflicts with
+other packages.
+
 Please read the INSTALL file for more information.
 
 You should now copy %%PREFIX%%/etc/ircd-hybrid/reference.conf to
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 521237)
+++ pkg-plist	(working copy)
@@ -1,5 +1,5 @@
 bin/ircd
-bin/mkpasswd
+bin/ircd-mkpasswd
 %%ETCDIR%%/reference.conf
 lib/ircd-hybrid/modules/autoload/m_accept.la
 lib/ircd-hybrid/modules/autoload/m_accept.so