diff --git a/x11/xfce4-screensaver/Makefile b/x11/xfce4-screensaver/Makefile
index acf61f97c723..84a98d4d672d 100644
--- a/x11/xfce4-screensaver/Makefile
+++ b/x11/xfce4-screensaver/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xfce4-screensaver
 PORTVERSION=	4.16.0
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -63,6 +64,6 @@ post-install:
 	@${REINPLACE_CMD} 's/^\(Name[^=]*=\)\(.*\)/\1XFCE \2/' ${STAGEDIR}${PREFIX}/etc/xdg/autostart/xfce4-screensaver.desktop
 
 post-install-PAM-on:
-	${INSTALL_DATA} ${FILESDIR}/xfce-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce-screensaver
+	${INSTALL_DATA} ${FILESDIR}/xfce4-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xfce4-screensaver.sample
 
 .include <bsd.port.post.mk>
diff --git a/x11/xfce4-screensaver/files/xfce-screensaver.pam b/x11/xfce4-screensaver/files/xfce4-screensaver.pam
similarity index 100%
rename from x11/xfce4-screensaver/files/xfce-screensaver.pam
rename to x11/xfce4-screensaver/files/xfce4-screensaver.pam
diff --git a/x11/xfce4-screensaver/pkg-plist b/x11/xfce4-screensaver/pkg-plist
index 730d9e2f2d62..cc081c0c9a78 100644
--- a/x11/xfce4-screensaver/pkg-plist
+++ b/x11/xfce4-screensaver/pkg-plist
@@ -2,7 +2,7 @@ bin/xfce4-screensaver
 bin/xfce4-screensaver-command
 bin/xfce4-screensaver-configure
 bin/xfce4-screensaver-preferences
-%%PAM%%etc/pam.d/xfce-screensaver
+%%PAM%%@sample etc/pam.d/xfce4-screensaver.sample
 etc/xdg/autostart/xfce4-screensaver.desktop
 etc/xdg/menus/xfce4-screensavers.menu
 libexec/xfce4-screensaver-dialog