diff --git a/x11/cde-25/Makefile b/x11/cde-25/Makefile
index 5596e6a3a8c1..4a8521f4be81 100644
--- a/x11/cde-25/Makefile
+++ b/x11/cde-25/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cde
 DISTVERSION=	2.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	SF/cdesktopenv/src/
 .if !defined(MASTERDIR)
@@ -66,6 +66,9 @@ CFLAGS+=	-Wno-register -Wno-incompatible-function-pointer-types \
 LDFLAGS+=	-z muldefs #--allow-multiple-definition
 LDFLAGS+=	-lutil
 
+CFFILES=	Xaccess Xconfig Xfailsafe Xreset Xservers Xsetup Xstartup \
+		sys.dtprofile
+
 pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh
 
@@ -124,5 +127,8 @@ post-install:
 	@cd ${STAGEDIR}/${DT_PREFIX}; ${LN} -s share/examples
 	# Only a problem on armv7 so far
 	${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -name 'ecp.*' -delete
+.for f in ${CFFILES}
+	@${MV} ${STAGEDIR}${PREFIX}/dt/config/${f} ${STAGEDIR}${PREFIX}/dt/config/${f}.sample
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/cde-25/pkg-plist b/x11/cde-25/pkg-plist
index bf88836bf8da..569547f0c03d 100644
--- a/x11/cde-25/pkg-plist
+++ b/x11/cde-25/pkg-plist
@@ -2588,23 +2588,23 @@ dt%%DT_ID%%/config/C/sys.dtwmrc
 dt%%DT_ID%%/config/C/sys.font
 dt%%DT_ID%%/config/C/sys.resources
 dt%%DT_ID%%/config/C/sys.session
-dt%%DT_ID%%/config/Xaccess
-dt%%DT_ID%%/config/Xconfig
-dt%%DT_ID%%/config/Xfailsafe
-dt%%DT_ID%%/config/Xreset
-dt%%DT_ID%%/config/Xservers
+@sample dt%%DT_ID%%/config/Xaccess.sample
+@sample dt%%DT_ID%%/config/Xconfig.sample
+@sample dt%%DT_ID%%/config/Xfailsafe.sample
+@sample dt%%DT_ID%%/config/Xreset.sample
+@sample dt%%DT_ID%%/config/Xservers.sample
 dt%%DT_ID%%/config/Xsession.d/0010.dtpaths
 dt%%DT_ID%%/config/Xsession.d/0020.dtims
 dt%%DT_ID%%/config/Xsession.d/0030.dttmpdir
 dt%%DT_ID%%/config/Xsession.d/0060.dtsysenv
-dt%%DT_ID%%/config/Xsetup
-dt%%DT_ID%%/config/Xstartup
+@sample dt%%DT_ID%%/config/Xsetup.sample
+@sample dt%%DT_ID%%/config/Xstartup.sample
 dt%%DT_ID%%/config/dtspcdenv
 dt%%DT_ID%%/config/dtterm.ti
 dt%%DT_ID%%/config/en_US.UTF-8
 dt%%DT_ID%%/config/ims/start.conf
 dt%%DT_ID%%/config/svc/CDE.lcx
-dt%%DT_ID%%/config/sys.dtprofile
+@sample dt%%DT_ID%%/config/sys.dtprofile.sample
 dt%%DT_ID%%/copyright
 dt%%DT_ID%%/%%ETCDIR%%/fontaliases/fonts.alias
 dt%%DT_ID%%/examples
diff --git a/x11/cde-devel/Makefile b/x11/cde-devel/Makefile
index 9c8995a7dba8..a9654fdac7ff 100644
--- a/x11/cde-devel/Makefile
+++ b/x11/cde-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cde
 PORTVERSION=	${COMMIT_DATE}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	-devel
@@ -72,6 +72,9 @@ CFLAGS+=	-Wno-register -Wno-incompatible-function-pointer-types \
 		-Wno-implicit-function-declaration
 LDFLAGS+=	-z muldefs #--allow-multiple-definition
 
+CFFILES=	Xaccess Xconfig Xfailsafe Xreset Xservers Xsetup Xstartup \
+		sys.dtprofile
+
 pre-configure:
 	@cd ${WRKSRC} && ./autogen.sh
 
@@ -130,5 +133,8 @@ post-install:
 	@cd ${STAGEDIR}/${DT_PREFIX}; ${LN} -sf share/examples
 	# Only a problem on armv7 so far
 	${FIND} ${STAGEDIR}/${DT_PREFIX} -type f -name 'ecp.*' -delete
+.for f in ${CFFILES}
+	@${MV} ${STAGEDIR}${PREFIX}/dt/config/${f} ${STAGEDIR}${PREFIX}/dt/config/${f}.sample
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/cde-devel/pkg-plist b/x11/cde-devel/pkg-plist
index bf88836bf8da..569547f0c03d 100644
--- a/x11/cde-devel/pkg-plist
+++ b/x11/cde-devel/pkg-plist
@@ -2588,23 +2588,23 @@ dt%%DT_ID%%/config/C/sys.dtwmrc
 dt%%DT_ID%%/config/C/sys.font
 dt%%DT_ID%%/config/C/sys.resources
 dt%%DT_ID%%/config/C/sys.session
-dt%%DT_ID%%/config/Xaccess
-dt%%DT_ID%%/config/Xconfig
-dt%%DT_ID%%/config/Xfailsafe
-dt%%DT_ID%%/config/Xreset
-dt%%DT_ID%%/config/Xservers
+@sample dt%%DT_ID%%/config/Xaccess.sample
+@sample dt%%DT_ID%%/config/Xconfig.sample
+@sample dt%%DT_ID%%/config/Xfailsafe.sample
+@sample dt%%DT_ID%%/config/Xreset.sample
+@sample dt%%DT_ID%%/config/Xservers.sample
 dt%%DT_ID%%/config/Xsession.d/0010.dtpaths
 dt%%DT_ID%%/config/Xsession.d/0020.dtims
 dt%%DT_ID%%/config/Xsession.d/0030.dttmpdir
 dt%%DT_ID%%/config/Xsession.d/0060.dtsysenv
-dt%%DT_ID%%/config/Xsetup
-dt%%DT_ID%%/config/Xstartup
+@sample dt%%DT_ID%%/config/Xsetup.sample
+@sample dt%%DT_ID%%/config/Xstartup.sample
 dt%%DT_ID%%/config/dtspcdenv
 dt%%DT_ID%%/config/dtterm.ti
 dt%%DT_ID%%/config/en_US.UTF-8
 dt%%DT_ID%%/config/ims/start.conf
 dt%%DT_ID%%/config/svc/CDE.lcx
-dt%%DT_ID%%/config/sys.dtprofile
+@sample dt%%DT_ID%%/config/sys.dtprofile.sample
 dt%%DT_ID%%/copyright
 dt%%DT_ID%%/%%ETCDIR%%/fontaliases/fonts.alias
 dt%%DT_ID%%/examples