diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 33cef09271502d6caf8aae37ba33856b2aaf7200..f4546e3ddc54c4d5def633b280718e66ee870279 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -322,8 +322,14 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	set_locale () {
-		echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-		locale-gen
+		if [ -f /etc/locale.gen ] ; then
+			#Debian:
+			sed -i -e 's:# en_US.UTF-8 UTF-8:en_US.UTF-8 UTF-8:g' /etc/locale.gen
+			locale-gen
+		else
+			#Ubuntu:
+			locale-gen en_US.UTF-8
+		fi
 		echo "LANG=en_US.UTF-8" > /etc/default/locale
 	}