diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 0ce5ba6a12a4..1c48849bc612 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wzdftpd
-PORTVERSION=	0.1
+PORTVERSION=	0.2.3
 PORTREVISION=	1
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,6 +17,8 @@ COMMENT=	Modular FTP server configurable online using SITE commands
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_SSL)
@@ -29,12 +31,15 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 DOCS=		AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
-		src/CHANGELOG src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO
+		ChangeLog src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO
 
-.if !defined(NOPORTDOCS)
 post-install:
+	${MV} ${PREFIX}/etc/wzd.cfg ${PREFIX}/etc/wzd.cfg.sample
+	${MV} ${DATADIR}/users ${DATADIR}/users.sample
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
+	${SED} -e 's,PREFIX,${PREFIX},g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/ftp/wzdftpd/distinfo b/ftp/wzdftpd/distinfo
index a527b62785da..968461fed840 100644
--- a/ftp/wzdftpd/distinfo
+++ b/ftp/wzdftpd/distinfo
@@ -1 +1,2 @@
-MD5 (wzdftpd-0.1.tar.gz) = ec3ada2fbea5384d5e92eb23bb102e88
+MD5 (wzdftpd-0.2.3.tar.gz) = f7c6a6fc7b80e17e2c8816895b3fa516
+SIZE (wzdftpd-0.2.3.tar.gz) = 566465
diff --git a/ftp/wzdftpd/files/patch-configure b/ftp/wzdftpd/files/patch-configure
deleted file mode 100644
index 96ceef111788..000000000000
--- a/ftp/wzdftpd/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Fri Oct 24 13:24:16 2003
-+++ configure	Thu Dec 18 18:30:49 2003
-@@ -4359,7 +4359,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CPP needs to be expanded
--    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/usr/bin/cpp"
-     do
-       ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -5376,7 +5376,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
--    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    for CXXCPP in "$CXX -E" "/usr/bin/cpp"
-     do
-       ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
diff --git a/ftp/wzdftpd/files/patch-src::Makefile.in b/ftp/wzdftpd/files/patch-src::Makefile.in
deleted file mode 100644
index d3d3627d51bc..000000000000
--- a/ftp/wzdftpd/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/Makefile.in.orig	Fri Oct 24 13:24:15 2003
-+++ src/Makefile.in	Thu Dec 18 18:44:27 2003
-@@ -253,13 +253,12 @@
- dist_pkgdata_DATA = file_ginfo.txt  file_help.txt   file_swho.txt \
- 	file_user.txt file_group.txt  file_rules.txt  \
- 	file_users.txt  file_who.txt  file_groups.txt  \
--	file_vfs.txt \
--	users
-+	file_vfs.txt
- 
- 
- 
- #sysconfdir = ${prefix}/etc/wzdftpd
--dist_sysconf_DATA = wzd.cfg wzd.pem
-+dist_sysconf_DATA = wzd.cfg
- 
- # them while "make clean", use CLEANFILES
- CLEANFILES = wzd_init_lex.c wzd_cookie_lex.c
-@@ -504,6 +503,7 @@
- 	  echo " $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- 	  $(dist_pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
- 	done
-+	$(dist_pkgdataDATA_INSTALL) $(srcdir)/users $(DESTDIR)$(pkgdatadir)/users.sample
- 
- uninstall-dist_pkgdataDATA:
- 	@$(NORMAL_UNINSTALL)
-@@ -520,7 +520,7 @@
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
- 	  echo " $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
--	  $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-+	  $(dist_sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f.sample; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/ftp/wzdftpd/patch-Makefile.am b/ftp/wzdftpd/patch-Makefile.am
deleted file mode 100644
index 5f0f883beab0..000000000000
--- a/ftp/wzdftpd/patch-Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.am.orig        Tue Nov  4 15:49:35 2003
-+++ src/Makefile.am     Tue Nov  4 15:51:07 2003
-@@ -93,7 +93,7 @@
-
- #sysconfdir = ${prefix}/etc/wzdftpd
-
--dist_sysconf_DATA = wzd.cfg wzd.pem
-+dist_sysconf_DATA = wzd.cfg
-
- install-data-hook:
-        ${INSTALL_PROGRAM} -m 775 -d @datadir@/wzdftpd/logs || true
-
diff --git a/ftp/wzdftpd/pkg-message b/ftp/wzdftpd/pkg-message
index 52207e6aa788..703144cafc05 100644
--- a/ftp/wzdftpd/pkg-message
+++ b/ftp/wzdftpd/pkg-message
@@ -1 +1,2 @@
-Sample file can be found at PREFIX/wzd.cfg.sample
+Sample config file can be found at PREFIX/etc/wzd.cfg.sample
+Sample users file can be found at PREFIX/share/wzdftpd/users.sample
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 86fa75193fb1..081010933cc4 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -3,6 +3,7 @@ bin/siteconfig
 bin/siteuptime
 bin/sitewho
 etc/wzd.cfg.sample
+etc/wzd.pem
 etc/init.d/wzdftpd
 lib/libwzd.a
 lib/libwzd.so
@@ -12,7 +13,7 @@ sbin/wzdftpd
 %%PORTDOCS%%%%DOCSDIR%%/Permissions.ReadMeFirst
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TLS.ReadMeFirst
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/DOCS_XFERLOG_FORMAT
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
 %%PORTDOCS%%%%DOCSDIR%%/TODO