diff --git a/code/tools/make_munki_mpkg.sh b/code/tools/make_munki_mpkg.sh
index 81b1cfbd..ba6f9bb4 100755
--- a/code/tools/make_munki_mpkg.sh
+++ b/code/tools/make_munki_mpkg.sh
@@ -289,10 +289,11 @@ chmod -R 755 "$COREROOT/usr"
 # edit this if list of tools changes!
 for TOOL in launchapp logouthelper managedsoftwareupdate supervisor ptyexec removepackages
 do
-	cp -X "$MUNKIROOT/code/client/$TOOL" "$COREROOT/usr/local/munki/" 2>&1
+    cp -X "$MUNKIROOT/code/client/$TOOL" "$COREROOT/usr/local/munki/" 2>&1
 done
-# Copy python library.
-cp -X "$MUNKIROOT/code/client/munkilib/"*.py "$COREROOT/usr/local/munki/munkilib/"
+# Copy python libraries.
+#cp -X "$MUNKIROOT/code/client/munkilib/"*.py "$COREROOT/usr/local/munki/munkilib/"
+rsync -a --exclude '*.pyc' --exclude '.DS_Store' "$MUNKIROOT/code/client/munkilib/" "$COREROOT/usr/local/munki/munkilib/"
 # Copy munki version.
 cp -X "$MUNKIROOT/code/client/munkilib/version.plist" "$COREROOT/usr/local/munki/munkilib/"
 # svnversion file was used when we were using subversion
diff --git a/code/tools/make_munki_mpkg_DEP.sh b/code/tools/make_munki_mpkg_DEP.sh
index 071173a5..5ce6d030 100755
--- a/code/tools/make_munki_mpkg_DEP.sh
+++ b/code/tools/make_munki_mpkg_DEP.sh
@@ -291,8 +291,9 @@ for TOOL in launchapp logouthelper managedsoftwareupdate supervisor ptyexec remo
 do
 	cp -X "$MUNKIROOT/code/client/$TOOL" "$COREROOT/usr/local/munki/" 2>&1
 done
-# Copy python library.
-cp -X "$MUNKIROOT/code/client/munkilib/"*.py "$COREROOT/usr/local/munki/munkilib/"
+# Copy python libraries.
+#cp -X "$MUNKIROOT/code/client/munkilib/"*.py "$COREROOT/usr/local/munki/munkilib/"
+rsync -a --exclude '*.pyc' --exclude '.DS_Store' "$MUNKIROOT/code/client/munkilib/" "$COREROOT/usr/local/munki/munkilib/"
 # Copy munki version.
 cp -X "$MUNKIROOT/code/client/munkilib/version.plist" "$COREROOT/usr/local/munki/munkilib/"
 # svnversion file was used when we were using subversion