diff --git a/Keywords/shadow.ucl b/Keywords/shadow.ucl
index 874f0796b..e2b0995b4 100644
--- a/Keywords/shadow.ucl
+++ b/Keywords/shadow.ucl
@@ -9,7 +9,7 @@
 # Where file1 is considered as a sample file and file2 the target file
 #
 # This will install the somefile.conf.sample and automatically copy to
-# somefile.conf if it doesn't exist. On deinstall it will be kept.
+# somefile.conf if it doesn't exist. On deinstall it will be removed.
 #
 # This replaces the old pattern:
 #  @unexec if cmp -s %D/etc/pkgtools.conf %D/etc/pkgtools.conf.sample; then rm -f %D/etc/pkgtools.conf; fi
@@ -51,4 +51,5 @@ pre-deinstall: <<EOD
   /*) target_file="${target_file}" ;;
   *) target_file="%D/${target_file}" ;;
   esac
+  rm -f "${target_file}"
 EOD
diff --git a/Mk/tree.mk b/Mk/tree.mk
index e7ad5d05e..c71324186 100644
--- a/Mk/tree.mk
+++ b/Mk/tree.mk
@@ -69,6 +69,10 @@ install-${TARGET}: force
 			mv -v "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE}" \
 			    "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE%%.sample}"; \
 		fi; \
+		if [ -n "${NO_SAMPLE}" -a "$${FILE%%.shadow}" != "$${FILE}" ]; then \
+			mv -v "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE}" \
+			    "${DESTDIR}${ROOT_${TARGET}}/${TREE}/$${FILE%%.shadow}"; \
+		fi; \
 	done
 .endfor
 
@@ -77,10 +81,15 @@ plist-${TARGET}: force
 	@(cd ${TREE}; find * -type f ${_IGNORES}) | while read FILE; do \
 		FILE="$${FILE%%.in}"; PREFIX=""; \
 		if [ -z "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
+			PREFIX="@sample "; \
+		fi; \
+		if [ -z "${NO_SAMPLE}" -a "$${FILE%%.shadow}" != "$${FILE}" ]; then \
+			FILE="$${FILE%%.shadow}.sample"; \
 			PREFIX="@shadow "; \
 		fi; \
 		if [ -n "${NO_SAMPLE}" ]; then \
 			FILE="$${FILE%%.sample}"; \
+			FILE="$${FILE%%.shadow}"; \
 		fi; \
 		echo "$${PREFIX}${ROOT_${TARGET}}/${TREE}/$${FILE}"; \
 	done
diff --git a/plist b/plist
index aa2a535aa..e8af3ca97 100644
--- a/plist
+++ b/plist
@@ -1133,8 +1133,8 @@
 /usr/local/www/widgets/widgets/traffic_graphs.widget.php
 /usr/local/www/wizard.php
 /usr/local/www/xmlrpc.php
-@shadow /usr/local/etc/bogons.sample
-@shadow /usr/local/etc/bogonsv6.sample
-@shadow /usr/local/etc/config.xml.sample
+@sample /usr/local/etc/bogons.sample
+@sample /usr/local/etc/bogonsv6.sample
+@sample /usr/local/etc/config.xml.sample
 @shadow /usr/local/etc/pkg/repos/FreeBSD.conf.sample
 @shadow /usr/local/etc/pkg/repos/origin.conf.sample
diff --git a/src/etc/pkg/repos/FreeBSD.conf.sample b/src/etc/pkg/repos/FreeBSD.conf.shadow
similarity index 100%
rename from src/etc/pkg/repos/FreeBSD.conf.sample
rename to src/etc/pkg/repos/FreeBSD.conf.shadow
diff --git a/src/etc/pkg/repos/origin.conf.sample.in b/src/etc/pkg/repos/origin.conf.shadow.in
similarity index 100%
rename from src/etc/pkg/repos/origin.conf.sample.in
rename to src/etc/pkg/repos/origin.conf.shadow.in