diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index 8d4cd26426e..915934cae85 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/08/06 03:11:38 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/08 21:04:16 naddy Exp $
 
 COMMENT=	caching DNS forwarder and DHCP server
 
 DISTNAME=	dnsmasq-2.45
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 
 MAINTAINER=	Rui Reis <rui@openbsd.org>
@@ -18,6 +19,8 @@ WANTLIB=		c
 
 MASTER_SITES=	http://www.thekelleys.org.uk/dnsmasq/
 
+MAKE_ENV=	CC="${CC}"
+
 NO_REGRESS=	Yes
 
 pre-build:
diff --git a/net/dnsmasq/patches/patch-bld_Makefile b/net/dnsmasq/patches/patch-bld_Makefile
new file mode 100644
index 00000000000..b0a9ec702e7
--- /dev/null
+++ b/net/dnsmasq/patches/patch-bld_Makefile
@@ -0,0 +1,9 @@
+$OpenBSD: patch-bld_Makefile,v 1.1 2009/03/08 21:04:16 naddy Exp $
+--- bld/Makefile.orig	Fri Mar  6 17:21:42 2009
++++ bld/Makefile	Fri Mar  6 17:21:47 2009
+@@ -1,4 +1,4 @@
+-CFLAGS = -Wall -W -O2
++#CFLAGS = -Wall -W -O2
+ 
+ OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
+        dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \