diff --git a/func/domain.sh b/func/domain.sh
index 07c3a1ce2..a96bda660 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -195,6 +195,10 @@ update_domain_zone() {
         done
 
         RECORD=$(idn --quiet -a -t "$RECORD")
+        if [ "$TYPE" = 'CNAME' ] || [ "$TYPE" = 'MX' ]; then
+            VALUE=$(idn --quiet -a -t "$VALUE")
+        fi
+
         if [ "$SUSPENDED" != 'yes' ]; then
             eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $conf
         fi