diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index c2c1f2aa12c1..fcd82107b1c9 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/source/ \
@@ -26,6 +26,10 @@ USE_BZIP2=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/run \
 		--disable-sendfile
 
+.if defined(WITH_SETPASSENT)
+CONFIGURE_ARGS+=	--enable-force-setpassent
+.endif
+
 .if defined(WITHOUT_PAM)
 CONFIGURE_ARGS+=	--disable-pam
 .endif
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 3009aa69ccb6..35352997e5af 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.2.tar.bz2) = 598735da589cffce5009473639abbef8
+MD5 (proftpd-1.2.3.tar.bz2) = b352dbd11880f5a207755d6a612a357a
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index c2c1f2aa12c1..fcd82107b1c9 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	proftpd
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
 		ftp://ftp.stikman.com/pub/proftpd/source/ \
@@ -26,6 +26,10 @@ USE_BZIP2=	YES
 CONFIGURE_ARGS=	--localstatedir=/var/run \
 		--disable-sendfile
 
+.if defined(WITH_SETPASSENT)
+CONFIGURE_ARGS+=	--enable-force-setpassent
+.endif
+
 .if defined(WITHOUT_PAM)
 CONFIGURE_ARGS+=	--disable-pam
 .endif
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 3009aa69ccb6..35352997e5af 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1 +1 @@
-MD5 (proftpd-1.2.2.tar.bz2) = 598735da589cffce5009473639abbef8
+MD5 (proftpd-1.2.3.tar.bz2) = b352dbd11880f5a207755d6a612a357a