diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index e403254021e..f3fa61702de 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2002/10/29 01:30:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2002/10/29 08:20:28 jakob Exp $
 
 COMMENT=	checks HTML documents for broken links
 
-DISTNAME=	linkchecker-1.3.11
+DISTNAME=	linkchecker-1.6.4
 CATEGORIES=    	www
 
-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linkchecker/}
 
 HOMEPAGE=	http://linkchecker.sourceforge.net/
 
@@ -16,10 +16,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-PYTHON_VER=	2.1
-BUILD_DEPENDS=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER}
+PYTHON_VER=	2.2
+BUILD_DEPENDS=	:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
+		:py-dns-*:net/py-dns
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+SUBST_VARS=	PYTHON_VER
+NO_REGRESS=	Yes
+PY_CMD=		@cd ${WRKSRC}; python${PYTHON_VER} ./setup.py
+
 do-configure:
 	cd ${WRKSRC}; python${PYTHON_VER} setup.py config
 
diff --git a/www/linkchecker/distinfo b/www/linkchecker/distinfo
index 6e6a17c4c0d..bbf8ae0be2f 100644
--- a/www/linkchecker/distinfo
+++ b/www/linkchecker/distinfo
@@ -1,3 +1,3 @@
-MD5 (linkchecker-1.3.11.tar.gz) = fe02c1280bcb139e6055be3a5235d8e3
-RMD160 (linkchecker-1.3.11.tar.gz) = 26febb8cd52b2b58db05d61dc7cbb558e44afdf4
-SHA1 (linkchecker-1.3.11.tar.gz) = feebd52c935bda5a43f1537782a7bf5783df20ef
+MD5 (linkchecker-1.6.4.tar.gz) = b0052d5478c6029a03d85486854f70cc
+RMD160 (linkchecker-1.6.4.tar.gz) = abc46f24541d469dec4c70c88d825f6ecd29aeb6
+SHA1 (linkchecker-1.6.4.tar.gz) = bb72d1622b465fc1a732951b7ec815accd3f1b0d
diff --git a/www/linkchecker/pkg/PLIST b/www/linkchecker/pkg/PLIST
index d04195132d5..060f563992a 100644
--- a/www/linkchecker/pkg/PLIST
+++ b/www/linkchecker/pkg/PLIST
@@ -1,42 +1,41 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/09/15 00:25:36 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/10/29 08:20:28 jakob Exp $
 bin/linkchecker
-lib/python2.1/site-packages/DNS/Base.py
-lib/python2.1/site-packages/DNS/Class.py
-lib/python2.1/site-packages/DNS/Lib.py
-lib/python2.1/site-packages/DNS/Opcode.py
-lib/python2.1/site-packages/DNS/Status.py
-lib/python2.1/site-packages/DNS/Type.py
-lib/python2.1/site-packages/DNS/__init__.py
-lib/python2.1/site-packages/DNS/lazy.py
-lib/python2.1/site-packages/DNS/winreg.py
-lib/python2.1/site-packages/_linkchecker_configdata.py
-lib/python2.1/site-packages/linkcheck/CSV.py
-lib/python2.1/site-packages/linkcheck/ChromeUrlData.py
-lib/python2.1/site-packages/linkcheck/Config.py
-lib/python2.1/site-packages/linkcheck/FileUrlData.py
-lib/python2.1/site-packages/linkcheck/FindUrlData.py
-lib/python2.1/site-packages/linkcheck/FtpUrlData.py
-lib/python2.1/site-packages/linkcheck/GopherUrlData.py
-lib/python2.1/site-packages/linkcheck/HostCheckingUrlData.py
-lib/python2.1/site-packages/linkcheck/HttpUrlData.py
-lib/python2.1/site-packages/linkcheck/HttpsUrlData.py
-lib/python2.1/site-packages/linkcheck/JavascriptUrlData.py
-lib/python2.1/site-packages/linkcheck/Logging.py
-lib/python2.1/site-packages/linkcheck/MailtoUrlData.py
-lib/python2.1/site-packages/linkcheck/NntpUrlData.py
-lib/python2.1/site-packages/linkcheck/StringUtil.py
-lib/python2.1/site-packages/linkcheck/TelnetUrlData.py
-lib/python2.1/site-packages/linkcheck/Threader.py
-lib/python2.1/site-packages/linkcheck/UrlData.py
-lib/python2.1/site-packages/linkcheck/__init__.py
-lib/python2.1/site-packages/linkcheck/debuglevels.py
-lib/python2.1/site-packages/linkcheck/fcgi.py
-lib/python2.1/site-packages/linkcheck/lc_cgi.py
-lib/python2.1/site-packages/linkcheck/linkname.py
-lib/python2.1/site-packages/linkcheck/sz_fcgi.py
-lib/python2.1/site-packages/linkcheck/timeoutsocket.py
-lib/python2.1/site-packages/linkcheck/util1.py
-man/man1/linkchecker.1
+lib/python${PYTHON_VER}/site-packages/_linkchecker_configdata.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/CSV.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/Config.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/FileUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/FtpUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/GopherUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/HostCheckingUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/HttpUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/HttpsUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/IgnoredUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/MailtoUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/NntpUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/ProxyUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/StringUtil.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/TelnetUrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/Threader.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/UrlData.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/__init__.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/debuglevels.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/fcgi.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/lc_cgi.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/linkname.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/BlacklistLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/CSVLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/ColoredLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/GMLLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/HtmlLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/Logger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/SQLLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/StandardLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/XMLLogger.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/log/__init__.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/sz_fcgi.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/test_support.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/timeoutsocket.py
+lib/python${PYTHON_VER}/site-packages/linkcheck/util1.py
 share/linkchecker/examples/index.html
 share/linkchecker/examples/lc.cgi
 share/linkchecker/examples/lc.fcgi
@@ -47,7 +46,9 @@ share/linkchecker/examples/linkchecker.bat
 share/linkchecker/linkcheckerrc
 share/locale/de/LC_MESSAGES/linkcheck.mo
 share/locale/fr/LC_MESSAGES/linkcheck.mo
+share/locale/nl/LC_MESSAGES/linkcheck.mo
+share/man/man1/linkchecker.1
 @dirrm share/linkchecker/examples
 @dirrm share/linkchecker
-@dirrm lib/python2.1/site-packages/linkcheck
-@dirrm lib/python2.1/site-packages/DNS
+@dirrm lib/python${PYTHON_VER}/site-packages/linkcheck/log
+@dirrm lib/python${PYTHON_VER}/site-packages/linkcheck