diff --git a/Mk/tree.mk b/Mk/tree.mk
index e61c5e637..e7ad5d05e 100644
--- a/Mk/tree.mk
+++ b/Mk/tree.mk
@@ -25,6 +25,13 @@
 
 .include "defaults.mk"
 
+IGNORES_DEFAULT=*.pyc .gitignore
+IGNORES+=	${IGNORES_DEFAULT}
+
+.for IGNORE in ${IGNORES}
+_IGNORES+=	! -name "${IGNORE}"
+.endfor
+
 .for TARGET in ${TREES} ${EXTRAS}
 
 .if "${TREES_${TARGET}}" == ""
@@ -46,7 +53,7 @@ install-${TARGET}: force
 	@REALTARGET=/$$(dirname ${TREE}); \
 	mkdir -p ${DESTDIR}${ROOT_${TARGET}}$${REALTARGET}; \
 	cp -vr ${TREE} ${DESTDIR}${ROOT_${TARGET}}$${REALTARGET}
-	@(cd ${TREE}; find * -type f ! -name "*.pyc") | while read FILE; do \
+	@(cd ${TREE}; find * -type f ${_IGNORES}) | while read FILE; do \
 		if [ "$${FILE%%.in}" != "$${FILE}" ]; then \
 			sed -i '' \
 			    -e "s=%%CORE_PACKAGESITE%%=${CORE_PACKAGESITE}=g" \
@@ -67,7 +74,7 @@ install-${TARGET}: force
 
 plist-${TARGET}: force
 .for TREE in ${TREES_${TARGET}}
-	@(cd ${TREE}; find * -type f ! -name "*.pyc") | while read FILE; do \
+	@(cd ${TREE}; find * -type f ${_IGNORES}) | while read FILE; do \
 		FILE="$${FILE%%.in}"; PREFIX=""; \
 		if [ -z "${NO_SAMPLE}" -a "$${FILE%%.sample}" != "$${FILE}" ]; then \
 			PREFIX="@shadow "; \
diff --git a/plist b/plist
index aaa65f5f9..c103d8d1c 100644
--- a/plist
+++ b/plist
@@ -255,7 +255,6 @@
 /usr/local/opnsense/contrib/google-api-php-client/Google/Verifier/Pem.php
 /usr/local/opnsense/contrib/google-api-php-client/Google/autoload.php
 /usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml
-/usr/local/opnsense/contrib/simplepie/.gitignore
 /usr/local/opnsense/contrib/simplepie/.travis.yml
 /usr/local/opnsense/contrib/simplepie/LICENSE.txt
 /usr/local/opnsense/contrib/simplepie/README.markdown
@@ -694,7 +693,6 @@
 /usr/local/opnsense/site-python/sqlite3_helper.py
 /usr/local/opnsense/site-python/watchers/__init__.py
 /usr/local/opnsense/site-python/watchers/dhcpd.py
-/usr/local/opnsense/version/.gitignore
 /usr/local/opnsense/www/.htaccess
 /usr/local/opnsense/www/api.php
 /usr/local/opnsense/www/css/bootstrap-datepicker3.min.css
@@ -906,7 +904,6 @@
 /usr/local/wizard/setup.xml
 /usr/local/www/carp_status.php
 /usr/local/www/crash_reporter.php
-/usr/local/www/csrf/.gitignore
 /usr/local/www/csrf/csrf-magic.js
 /usr/local/www/csrf/csrf-magic.php
 /usr/local/www/diag_authentication.php