diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index 275c076a8bf..6abd1cd56ba 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2005/10/21 16:20:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2006/07/19 09:15:48 alek Exp $
 
 COMMENT=	"caching DNS forwarder and DHCP server"
 
-DISTNAME=	dnsmasq-2.23
+DISTNAME=	dnsmasq-2.31
 CATEGORIES=	net
 
 MAINTAINER=	Jonathan Weiss <jw@innerewut.de>
@@ -23,11 +23,11 @@ USE_GMAKE=	Yes
 
 pre-build:
 	@perl -pi -e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" \
-		${WRKSRC}/dnsmasq.8 ${WRKSRC}/src/config.h
+		${WRKSRC}/man/dnsmasq.8 ${WRKSRC}/src/config.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example ${PREFIX}/share/examples
-	${INSTALL_MAN} ${WRKSRC}/dnsmasq.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo
index 08fa89676a8..01d6b80a741 100644
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,4 +1,4 @@
-MD5 (dnsmasq-2.23.tar.gz) = 7be1f5bd6446cbb743feaf26bf74db53
-RMD160 (dnsmasq-2.23.tar.gz) = 3ba342790e1912828a5bb389abfa4679e4d93c2c
-SHA1 (dnsmasq-2.23.tar.gz) = 6ddeaaa9b7a457d65c8d02980a69ccbd08925acc
-SIZE (dnsmasq-2.23.tar.gz) = 159102
+MD5 (dnsmasq-2.31.tar.gz) = 26932aec55865b5b4ffe53e7abcf9396
+RMD160 (dnsmasq-2.31.tar.gz) = 7f45c52a76a1edabb868c42069bc4e7710d414e5
+SHA1 (dnsmasq-2.31.tar.gz) = 0dbd561f7e82f3a8a9892347c75d747e816b3b14
+SIZE (dnsmasq-2.31.tar.gz) = 204338
diff --git a/net/dnsmasq/patches/patch-dnsmasq_8 b/net/dnsmasq/patches/patch-dnsmasq_8
deleted file mode 100644
index bb5547e37b8..00000000000
--- a/net/dnsmasq/patches/patch-dnsmasq_8
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-dnsmasq_8,v 1.2 2005/10/21 16:20:23 naddy Exp $
---- dnsmasq.8.orig	Fri Aug 26 12:20:41 2005
-+++ dnsmasq.8	Fri Oct 21 18:17:52 2005
-@@ -531,7 +531,7 @@ Add the domain to simple names (without 
- in the same way as for DHCP-derived names.
- .SH CONFIG FILE
- At startup, dnsmasq reads
--.I /etc/dnsmasq.conf,
-+.I !!SYSCONFDIR!!/dnsmasq.conf,
- if it exists. (On
- FreeBSD, the file is 
- .I /usr/local/etc/dnsmasq.conf
-@@ -670,7 +670,7 @@ configurations, allowing some control ov
- different classes of hosts.
- 
- .SH FILES
--.IR /etc/dnsmasq.conf 
-+.IR !!SYSCONFDIR!!/dnsmasq.conf 
- 
- .IR /usr/local/etc/dnsmasq.conf
- 
diff --git a/net/dnsmasq/patches/patch-man_dnsmasq_8 b/net/dnsmasq/patches/patch-man_dnsmasq_8
new file mode 100644
index 00000000000..a6081e92f66
--- /dev/null
+++ b/net/dnsmasq/patches/patch-man_dnsmasq_8
@@ -0,0 +1,21 @@
+$OpenBSD: patch-man_dnsmasq_8,v 1.1 2006/07/19 09:15:48 alek Exp $
+--- man/dnsmasq.8.orig	Wed Jun  7 07:37:25 2006
++++ man/dnsmasq.8	Wed Jun  7 07:38:22 2006
+@@ -584,7 +584,7 @@ configuration files, to include multiple
+ level of nesting is allowed.
+ .SH CONFIG FILE
+ At startup, dnsmasq reads
+-.I /etc/dnsmasq.conf,
++.I !!SYSCONFDIR!!/dnsmasq.conf,
+ if it exists. (On
+ FreeBSD, the file is 
+ .I /usr/local/etc/dnsmasq.conf
+@@ -723,7 +723,7 @@ configurations, allowing some control ov
+ different classes of hosts.
+ 
+ .SH FILES
+-.IR /etc/dnsmasq.conf 
++.IR !!SYSCONFDIR!!/dnsmasq.conf 
+ 
+ .IR /usr/local/etc/dnsmasq.conf
+