diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index fea7ec2ac2e..be1a210c2d2 100644
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:37 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/04/12 11:32:50 sthen Exp $
 
 COMMENT=	IP accounting software
 
-DISTNAME=	pmacct-0.12.3
+DISTNAME=	pmacct-0.12.5
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.pmacct.net/
@@ -19,6 +19,7 @@ MASTER_SITES=	${HOMEPAGE}
 
 LIB_DEPENDS+=	databases/sqlite3
 
+NO_REGRESS=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= --enable-64bit \
 		--enable-ipv6 \
diff --git a/net/pmacct/distinfo b/net/pmacct/distinfo
index d629a740962..e0b4b33d6cc 100644
--- a/net/pmacct/distinfo
+++ b/net/pmacct/distinfo
@@ -1,5 +1,5 @@
-MD5 (pmacct-0.12.3.tar.gz) = fkGWwPh/E4Ko7tTrG97NwQ==
-RMD160 (pmacct-0.12.3.tar.gz) = xS4qv0/YJawSXo/crHXstmiDaEA=
-SHA1 (pmacct-0.12.3.tar.gz) = Zw+q+1Eux4O/MhJoyDbolOauYx8=
-SHA256 (pmacct-0.12.3.tar.gz) = FMsO+XOg8bXAJXzbWUJEipknQfWcyLGAFUxb0k/aW94=
-SIZE (pmacct-0.12.3.tar.gz) = 542529
+MD5 (pmacct-0.12.5.tar.gz) = PRD5MBoX8DSg8iFJCpml0A==
+RMD160 (pmacct-0.12.5.tar.gz) = 3lBf+CFY+lbr3Cp/SFgUoGgLPQw=
+SHA1 (pmacct-0.12.5.tar.gz) = 77q8CuYk8bXBIpwN7Sa5vV3rxc0=
+SHA256 (pmacct-0.12.5.tar.gz) = UlLX3yTpuu/MWjbtZunKxa5QXJ1QLIz/uW5oCKy7L+g=
+SIZE (pmacct-0.12.5.tar.gz) = 552007
diff --git a/net/pmacct/pkg/PLIST b/net/pmacct/pkg/PLIST
index c1c1feb8c1b..490d363bf46 100644
--- a/net/pmacct/pkg/PLIST
+++ b/net/pmacct/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2010/08/17 19:51:18 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/04/12 11:32:50 sthen Exp $
 @bin bin/pmacct
 @bin sbin/nfacctd
 @bin sbin/pmacctd
@@ -22,7 +22,7 @@ share/doc/pmacct/README.sqlite3
 share/doc/pmacct/SIGNALS
 share/doc/pmacct/TRIGGER_VARS
 share/examples/pmacct/
-share/examples/pmacct/agent_to_peer.map
+share/examples/pmacct/agent_to_peer.map.example
 share/examples/pmacct/allow-list.example
 share/examples/pmacct/bgp_md5.lst.example
 share/examples/pmacct/gnuplot-example.sh
@@ -48,6 +48,7 @@ share/examples/pmacct/probe_netflow.conf.example
 share/examples/pmacct/probe_sflow.conf.example
 share/examples/pmacct/rrdtool-example.sh
 share/examples/pmacct/sql/
+share/examples/pmacct/sql/pmacct-create-db_v8.mysql
 share/examples/pmacct/sql/pmacct-create-table_bgp_v1.sqlite3
 share/examples/pmacct/sql/pmacct-create-table_v1.sqlite3
 share/examples/pmacct/sql/pmacct-create-table_v2.sqlite3
@@ -56,3 +57,4 @@ share/examples/pmacct/sql/pmacct-create-table_v4.sqlite3
 share/examples/pmacct/sql/pmacct-create-table_v5.sqlite3
 share/examples/pmacct/sql/pmacct-create-table_v6.sqlite3
 share/examples/pmacct/sql/pmacct-create-table_v7.sqlite3
+share/examples/pmacct/sql/pmacct-create-table_v8.sqlite3