diff --git a/src/setup.sh b/src/setup.sh
index df0e0a6..c21d9d8 100755
--- a/src/setup.sh
+++ b/src/setup.sh
@@ -47,12 +47,29 @@ elif [ -d "/etc/portage/package.unmask" ]; then
 fi
 
 # install
-test etc/portage/make.conf && cp etc/portage/make.conf /etc/portage/make.conf
-test etc/portage/package.use && cp etc/portage/package.use /etc/portage/package.use
-test etc/portage/package.accept_keywords && cp etc/portage/package.accept_keywords /etc/portage/package.accept_keywords
-test etc/portage/package.license && cp etc/portage/package.license /etc/portage/package.license
-test etc/portage/package.mask && cp etc/portage/package.mask /etc/portage/package.mask
-test etc/portage/package.unmask && cp etc/portage/package.unmask /etc/portage/package.unmask
+if [ -e "etc/portage/make.conf" ]; then
+    cp etc/portage/make.conf /etc/portage/make.conf
+fi
+
+if [ -e "etc/portage/package.use" ]; then
+    cp etc/portage/package.use /etc/portage/package.use
+fi
+
+if [ -e "etc/portage/package.accept_keywords" ]; then
+    cp etc/portage/package.accept_keywords /etc/portage/package.accept_keywords
+fi
+
+if [ -e "etc/portage/package.license" ]; then
+    cp etc/portage/package.license /etc/portage/package.license
+fi
+
+if [ -e "etc/portage/package.mask" ]; then
+    cp etc/portage/package.mask /etc/portage/package.mask
+fi
+
+if [ -e "etc/portage/package.unmask" ]; then
+    cp etc/portage/package.unmask /etc/portage/package.unmask
+fi
 
 echo "NOTE: This make.conf has options by default that are very host specific."
 echo "Edit it to match your system. I have commented lines for all my computers (ThinkPad X220, my desktop and virtual machines) that you can just uncomment."