diff --git a/debian/changelog b/debian/changelog
index fd6bdf91..a1f2d0d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 linkchecker (1.4.2) unstable; urgency=low
 
   * move DNS package into linkchecker to prevent clash with the original
-    Python DNS module (Closes: #143737)
+    Python DNS module (Closes: #143737).
   * Updated german translation.
+  * Adjust the internal error message slightly to ask for commandline
+    parameters.
+  * linkcheck/UrlData.py: modify the linkmatcher pattern to prevent a
+    RuntimeError: maximum recursion limit exceeded.
 
- -- Bastian Kleineidam <calvin@debian.org>  Sat, 27 Apr 2002 11:59:32 +0200
+ -- Bastian Kleineidam <calvin@debian.org>  Sat, 27 Apr 2002 14:14:50 +0200
 
 linkchecker (1.4.1) unstable; urgency=low
 
diff --git a/linkcheck/Config.py b/linkcheck/Config.py
index 4ac5fd91..5325bb5a 100644
--- a/linkcheck/Config.py
+++ b/linkcheck/Config.py
@@ -28,8 +28,8 @@ App = AppName+" "+Version
 UserAgent = AppName+"/"+Version
 Author =  _linkchecker_configdata.author
 HtmlAuthor = Author.replace(' ', '&nbsp;')
-Copyright = "Copyright © 2000,2001 by "+Author
-HtmlCopyright = "Copyright &copy; 2000,2001 by "+HtmlAuthor
+Copyright = "Copyright © 2000-2002 "+Author
+HtmlCopyright = "Copyright &copy; 2000-2002 "+HtmlAuthor
 AppInfo = App+"              "+Copyright
 HtmlAppInfo = App+", "+HtmlCopyright
 Url = _linkchecker_configdata.url
diff --git a/linkcheck/UrlData.py b/linkcheck/UrlData.py
index b9338638..e57026b3 100644
--- a/linkcheck/UrlData.py
+++ b/linkcheck/UrlData.py
@@ -77,16 +77,16 @@ _linkMatcher = r"""
     \s*            # whitespace
     %s             # tag name
     \s+            # whitespace
-    [^>]*?         # skip leading attributes (fails on Python 2.2b2)
+    ([^"'>]|"[^"]"|'[^']')*?         # skip leading attributes
     %s             # attrib name
     \s*            # whitespace
     =              # equal sign
     \s*            # whitespace
     (?P<value>     # attribute value
-     ".*?" |       # in double quotes
-     '.*?' |       # in single quotes
+     "[^"]*" |      # in double quotes
+     '[^']*' |      # in single quotes
      [^\s>]+)      # unquoted
-    ([^">]|".*?")* # skip trailing attributes
+    ([^"'>]|"[^"]"|'[^']')*          # skip trailing attributes
     >              # close tag
     """
 
diff --git a/setup.py b/setup.py
index 03c3c73d..5dce08e4 100755
--- a/setup.py
+++ b/setup.py
@@ -154,7 +154,7 @@ o a (Fast)CGI web interface (requires HTTP server)
 """,
        distclass = MyDistribution,
        cmdclass = {'install': MyInstall},
-       packages = ['','linkcheck'],
+       packages = ['', 'linkcheck', 'linkcheck.DNS'],
        scripts = ['linkchecker'],
        data_files = [
          ('share/locale/de/LC_MESSAGES',