diff -urN gdm/Makefile gdm.new/Makefile
--- gdm/Makefile	2016-10-09 05:10:02.000000000 -0700
+++ gdm.new/Makefile	2017-07-27 22:48:20.322280000 -0700
@@ -131,6 +131,12 @@
 		${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default \
 		${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/Init/Default \
+		${STAGEDIR}${PREFIX}/etc/gdm/Init/Default.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/Xsession \
+		${STAGEDIR}${PREFIX}/etc/gdm/Xsession.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/gdm.conf \
+		${STAGEDIR}${PREFIX}/etc/dbus-1/system.d/gdm.conf.sample
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
@@ -139,13 +145,13 @@
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
 
-	${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
-	${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
-	${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
+	${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin.sample
+	${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment.sample
+	${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password.sample
 
-	${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+	${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/client.conf.sample
 
-	${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
+	${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/locale.conf.sample
 
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
diff -urN gdm/pkg-plist gdm.new/pkg-plist
--- gdm/pkg-plist	2015-08-05 12:13:24.000000000 -0700
+++ gdm.new/pkg-plist	2017-07-27 22:48:54.068319000 -0700
@@ -1,17 +1,17 @@
 bin/gdm-screenshot
 bin/gdmflexiserver
-etc/dbus-1/system.d/gdm.conf
-%%ETCDIR%%/Init/Default
+@sample etc/dbus-1/system.d/gdm.conf.sample
+@sample %%ETCDIR%%/Init/Default.sample
 @sample %%ETCDIR%%/PostLogin/Default.sample
 @sample %%ETCDIR%%/PostSession/Default.sample
 @sample %%ETCDIR%%/PreSession/Default.sample
-%%ETCDIR%%/Xsession
+@sample %%ETCDIR%%/Xsession.sample
 @sample %%ETCDIR%%/custom.conf.sample
-%%ETCDIR%%/home/.pulse/client.conf
-%%ETCDIR%%/locale.conf
-etc/pam.d/gdm-autologin
-etc/pam.d/gdm-launch-environment
-etc/pam.d/gdm-password
+@sample %%ETCDIR%%/home/.pulse/client.conf.sample
+@sample %%ETCDIR%%/locale.conf.sample
+@sample etc/pam.d/gdm-autologin.sample
+@sample etc/pam.d/gdm-launch-environment.sample
+@sample etc/pam.d/gdm-password.sample
 include/gdm/gdm-client-glue.h
 include/gdm/gdm-client.h
 include/gdm/gdm-sessions.h