diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 8fb2e04ef544..2c6f0a496f94 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wdm
 PORTVERSION=	1.28
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://voins.program.ru/wdm/:wdm \
 		http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
@@ -72,8 +72,8 @@ post-patch:
 		's|/etc/X11/wdm|${WDMDIR}|g' ${WRKSRC}/doc/wdmLogin.man
 
 post-install:
-	@${MV} ${STAGEDIR}${WDMDIR}/wdm-config ${STAGEDIR}${WDMDIR}/wdm-config.dist
-	@${MV} ${STAGEDIR}${WDMDIR}/Xsetup_0 ${STAGEDIR}${WDMDIR}/Xsetup_0.dist
+	@${MV} ${STAGEDIR}${WDMDIR}/wdm-config ${STAGEDIR}${WDMDIR}/wdm-config.sample
+	@${MV} ${STAGEDIR}${WDMDIR}/Xsetup_0 ${STAGEDIR}${WDMDIR}/Xsetup_0.sample
 .for file in beastie.xpm daemon1-HQ-1280x960.jpg
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${STAGEDIR}${WDMDIR}/pixmaps
 .endfor
diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist
index 7a6ea7c02eea..4546c64ca25f 100644
--- a/x11/wdm/pkg-plist
+++ b/x11/wdm/pkg-plist
@@ -12,9 +12,7 @@ lib/X11/wdm/Xservers.ws
 lib/X11/wdm/Xsession
 lib/X11/wdm/Xsession.XFree86
 lib/X11/wdm/Xsession.orig
-@unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi
-lib/X11/wdm/Xsetup_0.dist
-@exec [ -f %D/lib/X11/wdm/Xsetup_0 ] || (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0)
+@sample lib/X11/wdm/Xsetup_0.sample
 lib/X11/wdm/pixmaps/Eagle.xpm
 lib/X11/wdm/pixmaps/Earth.jpg
 lib/X11/wdm/pixmaps/Earth200x130.xpm
@@ -24,9 +22,7 @@ lib/X11/wdm/pixmaps/StarsLogo.jpg
 lib/X11/wdm/pixmaps/beastie.xpm
 lib/X11/wdm/pixmaps/daemon1-HQ-1280x960.jpg
 lib/X11/wdm/pixmaps/gnuLogo.xpm
-@unexec if cmp -s %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config; then rm -f %D/lib/X11/wdm/wdm-config; fi
-lib/X11/wdm/wdm-config.dist
-@exec [ -f %D/lib/X11/wdm/wdm-config ] || (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config)
+@sample lib/X11/wdm/wdm-config.sample
 lib/X11/wdm/wdm-config.in
 lib/X11/wdm/wdmReconfig
 man/man1/wdm.1.gz
@@ -40,10 +36,7 @@ share/locale/fr_FR/LC_MESSAGES/wdm.mo
 share/locale/ja/LC_MESSAGES/wdm.mo
 share/locale/ru/LC_MESSAGES/wdm.mo
 @dirrmtry lib/X11/wdm/pixmaps
-@exec mkdir -p %D/lib/X11/wdm/authdir
 @dirrmtry lib/X11/wdm/authdir
 @dirrmtry lib/X11/wdm
-%%PAM%%@cwd %%LOCALBASE%%
-%%PAM%%etc/pam.d/wdm
-@cwd /
+%%PAM%%%%LOCALBASE%%/etc/pam.d/wdm
 @dirrmtry /var/run/wdm