diff --git a/debian/changelog b/debian/changelog
index 263dc8b8..9a53b0d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linkchecker (8.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Remove unneeded dependency on pysqlite.
+  * Remove conflict on python-dns.
+    Closes: #694809
 
  -- Bastian Kleineidam <calvin@debian.org>  Wed, 14 Nov 2012 18:49:41 +0100
 
diff --git a/debian/control b/debian/control
index 409c6e0f..fa8e3cf8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: linkchecker
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, python (>= 2.7.2)
 Provides: ${python:Provides}
-Conflicts: python-dnspython
 Suggests: clamav-daemon,
           linkchecker-gui,
           linkchecker-web,
diff --git a/debian/linkchecker.install b/debian/linkchecker.install
index 0ee6c768..77996ccf 100644
--- a/debian/linkchecker.install
+++ b/debian/linkchecker.install
@@ -1,6 +1,6 @@
 usr/bin/linkchecker
 usr/lib/python*/dist-packages/_LinkChecker_configdata.py
-usr/lib/python*/dist-packages/dns
+usr/lib/python*/dist-packages/linkcheck_dns
 usr/lib/python*/dist-packages/linkcheck/*.py
 usr/lib/python*/dist-packages/linkcheck/HtmlParser
 usr/lib/python*/dist-packages/linkcheck/bookmarks
diff --git a/doc/changelog.txt b/doc/changelog.txt
index f3dbf914..8138588e 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,6 +2,8 @@
 
 Changes:
 - logging: Print system arguments (sys.argv) in internal error information.
+- installation: Install the dns Python module into linkcheck_dns subdirectory to avoid
+  conflicts with an upstream python-dns installation.
 
 
 8.2 "Belle De Jour" (released 9.11.2012)
diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
index 3929790d..1364b41f 100644
--- a/linkcheck/__init__.py
+++ b/linkcheck/__init__.py
@@ -26,6 +26,11 @@ if not (hasattr(sys, 'version_info') or
         sys.version_info < (2, 7, 2, 'final', 0)):
     raise SystemExit("This program requires Python 2.7.2 or later.")
 import os
+# add the custom linkcheck_dns directory to sys.path
+_dnspath = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'linkcheck_dns'))
+if _dnspath not in sys.path:
+    sys.path.insert(0, _dnspath)
+del _dnspath
 import re
 
 from . import i18n
diff --git a/setup.py b/setup.py
index fbb1965d..dfa215bf 100644
--- a/setup.py
+++ b/setup.py
@@ -869,7 +869,7 @@ o a command line, GUI and web interface
         'register': MyRegister,
     },
     package_dir = {
-        'dns': 'third_party/dnspython/dns',
+        'linkcheck_dns.dns': 'third_party/dnspython/dns',
     },
     packages = [
         'linkcheck',
@@ -883,10 +883,10 @@ o a command line, GUI and web interface
         'linkcheck.HtmlParser',
         'linkcheck.logger',
         'linkcheck.network',
-        'dns',
-        'dns.rdtypes',
-        'dns.rdtypes.ANY',
-        'dns.rdtypes.IN',
+        'linkcheck_dns.dns',
+        'linkcheck_dns.dns.rdtypes',
+        'linkcheck_dns.dns.rdtypes.ANY',
+        'linkcheck_dns.dns.rdtypes.IN',
     ],
     ext_modules = [
         Extension('linkcheck.HtmlParser.htmlsax',