diff --git a/src/yunohost/utils/dns.py b/src/yunohost/utils/dns.py
index 46b294602..1d67d73d0 100644
--- a/src/yunohost/utils/dns.py
+++ b/src/yunohost/utils/dns.py
@@ -26,15 +26,17 @@ YNH_DYNDNS_DOMAINS = ["nohost.me", "noho.st", "ynh.fr"]
 def get_public_suffix(domain):
     """get_public_suffix("www.example.com") -> "example.com"
 
-    Return the public suffix of a domain name based 
+    Return the public suffix of a domain name based
     """
     # Load domain public suffixes
     psl = PublicSuffixList()
 
     public_suffix = psl.publicsuffix(domain)
+
+    # FIXME: wtf is this supposed to do ? :|
     if public_suffix in YNH_DYNDNS_DOMAINS:
-        domain_prefix = domain_name[0:-(1 + len(public_suffix))]
-        public_suffix =  domain_prefix.plit(".")[-1] + "." + public_suffix
+        domain_prefix = domain[0:-(1 + len(public_suffix))]
+        public_suffix = domain_prefix.split(".")[-1] + "." + public_suffix
 
     return public_suffix
 
@@ -45,19 +47,30 @@ def get_dns_zone_from_domain(domain):
 
     Keyword arguments:
         domain -- The domain name
-        
+
     """
-    separator = "."
-    domain_subs = domain.split(separator)
-    for i in range(0, len(domain_subs)):
-        current_domain = separator.join(domain_subs)
-        answer = dig(current_domain, rdtype="NS", full_answers=True, resolvers="force_external")
-        if answer[0] == "ok" :
+
+    # For foo.bar.baz.gni we want to scan all the parent domains
+    # (including the domain itself)
+    # foo.bar.baz.gni
+    #     bar.baz.gni
+    #         baz.gni
+    #             gni
+    parent_list = [domain.split(".", i)[-1]
+                   for i, _ in enumerate(domain.split("."))]
+
+    for parent in parent_list:
+
+        # Check if there's a NS record for that domain
+        answer = dig(parent, rdtype="NS", full_answers=True, resolvers="force_external")
+        if answer[0] == "ok":
             # Domain is dns_zone
-            return current_domain
-        if separator.join(domain_subs[1:]) == get_public_suffix(current_domain):
-            # Couldn't check if domain is dns zone,
+            return parent
+        # Otherwise, check if the parent of this parent is in the public suffix list
+        if parent.split(".", 1)[-1] == get_public_suffix(parent):
+            # Couldn't check if domain is dns zone,    # FIXME : why "couldn't" ...?
             # returning private suffix
-            return current_domain
-        domain_subs.pop(0)
-    return None
\ No newline at end of file
+            return parent
+
+    # FIXME: returning None will probably trigger bugs when this happens, code expects a domain string
+    return None