diff --git a/Util/BuildTools/Environment.sh b/Util/BuildTools/Environment.sh
index 059da0f8c..828b1ad24 100644
--- a/Util/BuildTools/Environment.sh
+++ b/Util/BuildTools/Environment.sh
@@ -38,7 +38,7 @@ function get_carla_version {
 
 function copy_if_changed {
   mkdir -p $(dirname $2)
-  rsync -cI --out-format="%n" $1 $2
+  rsync -cIr --out-format="%n" $1 $2
 }
 
 function move_if_changed {
diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh
index 3824d2c8f..20ac3b10f 100755
--- a/Util/BuildTools/Package.sh
+++ b/Util/BuildTools/Package.sh
@@ -100,11 +100,13 @@ if $DO_COPY_FILES ; then
   # copy_if_changed "./Docs/Example.CarlaSettings.ini" "${DESTINATION}/Example.CarlaSettings.ini"
   copy_if_changed "./Util/Docker/Release.Dockerfile" "${DESTINATION}/Dockerfile"
   copy_if_changed "./PythonAPI/dist/*.egg" "${DESTINATION}/PythonAPI/"
-  copy_if_changed "./PythonAPI/tutorial.py" "${DESTINATION}/tutorial.py"
-  copy_if_changed "./PythonAPI/manual_control.py" "${DESTINATION}/manual_control.py"
+  copy_if_changed "./PythonAPI/agents/" "${DESTINATION}/PythonAPI/agents"
+  copy_if_changed "./PythonAPI/automatic_control.py" "${DESTINATION}/automatic_control.py"
   copy_if_changed "./PythonAPI/dynamic_weather.py" "${DESTINATION}/dynamic_weather.py"
-  copy_if_changed "./PythonAPI/vehicle_gallery.py" "${DESTINATION}/vehicle_gallery.py"
+  copy_if_changed "./PythonAPI/manual_control.py" "${DESTINATION}/manual_control.py"
   copy_if_changed "./PythonAPI/spawn_npc.py" "${DESTINATION}/spawn_npc.py"
+  copy_if_changed "./PythonAPI/tutorial.py" "${DESTINATION}/tutorial.py"
+  copy_if_changed "./PythonAPI/vehicle_gallery.py" "${DESTINATION}/vehicle_gallery.py"
 
   popd >/dev/null