diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py
index fe2a1bc9b..9904d3955 100644
--- a/src/yunohost/dyndns.py
+++ b/src/yunohost/dyndns.py
@@ -35,11 +35,10 @@ from moulinette.core import MoulinetteError
 from moulinette.utils.log import getActionLogger
 from moulinette.utils.filesystem import write_to_file, read_file
 from moulinette.utils.network import download_json
-from moulinette.utils.process import check_output
 
 from yunohost.utils.error import YunohostError
 from yunohost.domain import _get_maindomain, _build_dns_conf
-from yunohost.utils.network import get_public_ip
+from yunohost.utils.network import get_public_ip, dig
 from yunohost.log import is_unit_operation
 
 logger = getActionLogger('yunohost.dyndns')
@@ -216,8 +215,36 @@ def dyndns_update(operation_logger, dyn_host="dyndns.yunohost.org", domain=None,
         'zone %s' % host,
     ]
 
-    old_ipv4 = check_output("dig @%s +short %s" % (dyn_host, domain)) or None
-    old_ipv6 = check_output("dig @%s +short aaaa %s" % (dyn_host, domain)) or None
+
+    def resolve_domain(domain, rdtype):
+
+        # FIXME make this work for IPv6-only hosts too..
+        ok, result = dig(dyn_host, "A")
+        dyn_host_ip = result[0] if ok == "ok" and len(result) else None
+        if not dyn_host_ip:
+            raise YunohostError("Failed to resolve %s" % dyn_host)
+     
+        ok, result = dig(domain, rdtype, resolvers=[dyn_host_ip])
+        if ok == "ok":
+            return result[0] if len(result) else None
+        elif result[0] == "Timeout":
+            logger.debug("Timed-out while trying to resolve %s record for %s using %s" % (rdtype, domain, dyn_host))
+        else:
+            return None
+
+        logger.debug("Falling back to external resolvers")
+        ok, result = dig(domain, rdtype, resolvers="force_external")
+        if ok == "ok":
+            return result[0] if len(result) else None
+        elif result[0] == "Timeout":
+            logger.debug("Timed-out while trying to resolve %s record for %s using external resolvers : %s" % (rdtype, domain, result))
+        else:
+            return None
+
+        raise YunohostError("Failed to resolve %s for %s" % (rdtype, domain), raw_msg=True)
+
+    old_ipv4 = resolve_domain(domain, "A")
+    old_ipv6 = resolve_domain(domain, "AAAA")
 
     # Get current IPv4 and IPv6
     ipv4_ = get_public_ip()