diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 8104ecf..0610a40 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -102,8 +102,8 @@ configure_mhwd_drivers(){
 configure_lsb(){
     if [ -e $1/etc/lsb-release ] ; then
         msg2 "Configuring lsb-release"
-        sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $1/etc/lsb-release
-        sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${dist_codename}/" $1/etc/lsb-release
+        sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=\"${dist_release}\"/" $1/etc/lsb-release
+        sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=\"${dist_codename}\"/" $1/etc/lsb-release
     fi
 }