diff --git a/upgrade4to5 b/upgrade4to5
index e396dc8..f7a131f 100755
--- a/upgrade4to5
+++ b/upgrade4to5
@@ -86,10 +86,12 @@ echo "Running apt-get update ..."
 apt-get update
 
 echo "Updating base-files ..."
-apt-get --yes --option DPkg::Options::="--force-confnew" install base-files
+apt-get --option DPkg::Options::="--force-confnew" install base-files
 
 echo "Running apt-get dist-upgrade ..."
-apt-get dist-upgrade
+apt-get --option DPkg::Options::="--force-confdef" \
+        --option DPkg::Options::="--force-confold" \
+        dist-upgrade
 
 arch="$(dpkg --print-architecture)"
 rule="/etc/udev/rules.d/80-net-setup-link.rules"