diff --git a/net/totd/Makefile b/net/totd/Makefile
index c401b243be4..2bd1379bf59 100644
--- a/net/totd/Makefile
+++ b/net/totd/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2001/06/22 13:28:49 itojun Exp $
+# $OpenBSD: Makefile,v 1.15 2002/01/28 01:41:52 jsyn Exp $
 # $NetBSD: Makefile,v 1.3 2000/01/21 10:01:23 itojun Exp $
 
 COMMENT=	"DNS proxy that supports IPv6 <==> IPv4 record translation"
 
 DISTNAME=	totd-1.2
 CATEGORIES=	net
-NEED_VERSION=	1.402
+NEED_VERSION=	1.504
 MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
 
 MAINTAINER=	Jun-ichiro itojun Hagino <itojun@itojun.org>
-HOMEPAGE=	http://www.vermicelli.cs.uit.no/ipv6/software.html
+HOMEPAGE=	http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -18,6 +18,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	gnu
 
+NO_REGRESS=		Yes
+
+MAKE_FLAGS=		CC="${CC}" SYSCONFDIR="${SYSCONFDIR}"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/totd
 	${INSTALL_DATA} ${FILESDIR}/totd.conf.sample ${PREFIX}/share/totd
diff --git a/net/totd/files/md5 b/net/totd/distinfo
similarity index 100%
rename from net/totd/files/md5
rename to net/totd/distinfo
diff --git a/net/totd/files/totd.conf.sample b/net/totd/files/totd.conf.sample
index bec4e9f629e..e7393b8e9e8 100644
--- a/net/totd/files/totd.conf.sample
+++ b/net/totd/files/totd.conf.sample
@@ -1,3 +1,4 @@
+; $OpenBSD: totd.conf.sample,v 1.2 2002/01/28 01:41:52 jsyn Exp $
 ; $NetBSD: totd.conf.sample,v 1.1.1.1 1999/11/22 21:04:01 itojun Exp $
 ; Totd sample configuration file
 forwarder 192.168.0.1 port 5000
diff --git a/net/totd/patches/patch-ab b/net/totd/patches/patch-Makefile_in
similarity index 88%
rename from net/totd/patches/patch-ab
rename to net/totd/patches/patch-Makefile_in
index 7ac2ae64c7c..ab35d1f9da5 100644
--- a/net/totd/patches/patch-ab
+++ b/net/totd/patches/patch-Makefile_in
@@ -1,3 +1,4 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2002/01/28 01:41:52 jsyn Exp $
 --- Makefile.in.orig	Tue Mar 13 22:12:22 2001
 +++ Makefile.in	Fri Jun 22 22:56:48 2001
 @@ -10,7 +10,7 @@
@@ -5,7 +6,7 @@
  INSTALLMAN = @prefix@/man
  INSTALL = /usr/bin/install
 -TOT_CONFIG_FILE=@prefix@/etc/totd.conf
-+TOT_CONFIG_FILE=/etc/totd.conf
++TOT_CONFIG_FILE=${SYSCONFDIR}/totd.conf
  CFLAGS  = @CFLAGS@ @DEFS@  -DTOT_CONFIG_FILE=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH)
  .if defined(DBMALLOC)
  LIBDEBUG = -L/usr/local/lib -ldbmalloc
diff --git a/net/totd/patches/patch-aa b/net/totd/patches/patch-config_h_in
similarity index 88%
rename from net/totd/patches/patch-aa
rename to net/totd/patches/patch-config_h_in
index 2a3cb92ea7c..1b7a3842602 100644
--- a/net/totd/patches/patch-aa
+++ b/net/totd/patches/patch-config_h_in
@@ -1,3 +1,4 @@
+$OpenBSD: patch-config_h_in,v 1.1 2002/01/28 01:41:52 jsyn Exp $
 --- config.h.in-	Sun Apr 23 22:17:36 2000
 +++ config.h.in	Sun Apr 23 22:17:45 2000
 @@ -33,9 +33,9 @@