diff --git a/linkcheck/checker/mailtourl.py b/linkcheck/checker/mailtourl.py
index 394a475c..bdfe0fd5 100644
--- a/linkcheck/checker/mailtourl.py
+++ b/linkcheck/checker/mailtourl.py
@@ -28,10 +28,6 @@ from email._parseaddr import AddressList
 from . import urlbase
 from .. import log, LOG_CHECK, strformat, url as urlutil
 from dns import resolver
-if False:
-    # needed for py2exe to properly include all dns submodules
-    from dns.rdtypes.ANY import *
-    from dns.rdtypes.IN import *
 from ..network import iputil
 from .const import WARN_MAIL_NO_MX_HOST, \
     WARN_MAIL_UNVERIFIED_ADDRESS, WARN_MAIL_NO_CONNECTION
diff --git a/setup.py b/setup.py
index 4180e43b..2d5d90ec 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,8 @@ from distutils.core import Distribution
 AppVersion = "7.0"
 AppName = "LinkChecker"
 
+# basic includes for py2exe and py2app
+py_includes = ['dns.rdtypes.IN.*', 'dns.rdtypes.ANY.*']
 # basic excludes for py2exe and py2app
 py_excludes = ['doctest', 'unittest', 'optcomplete', 'Tkinter',
     'PyQt4.QtDesigner', 'PyQt4.QtNetwork', 'PyQt4.QtOpenGL',
@@ -81,13 +83,14 @@ py2exe_options = dict(
     dll_excludes=['MSVCP90.dll'],
     # add sip so that PyQt4 works
     # add PyQt4.QtSql so that sqlite needed by QHelpCollection works
-    includes=["sip", "PyQt4.QtSql"],
+    includes=py_includes + ["sip", "PyQt4.QtSql"],
     compressed=1,
     optimize=2,
 )
 # py2app options for OSX packaging
 py2app_options = dict(
-    includes=['sip', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtSql'],
+    includes=py_includes + ['sip', 'PyQt4',
+      'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtSql'],
     excludes=py_excludes,
     strip=True,
     optimize=2,