diff --git a/net/owamp/Makefile b/net/owamp/Makefile
index 861174fc129..ddddc35ce0b 100644
--- a/net/owamp/Makefile
+++ b/net/owamp/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	rfc4656 one-way active measurement protocol
 
 DISTNAME =	owamp-3.1
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	net
 
diff --git a/net/owamp/patches/patch-owamp_api_c b/net/owamp/patches/patch-owamp_api_c
new file mode 100644
index 00000000000..f9f9886a6cc
--- /dev/null
+++ b/net/owamp/patches/patch-owamp_api_c
@@ -0,0 +1,12 @@
+Index: owamp/api.c
+--- owamp/api.c.orig
++++ owamp/api.c
+@@ -2313,7 +2313,7 @@ GetSessionFinishedType(
+     phdr->finished = GetSessionFinishedType(ctx,ntohl(finished));
+ 
+     if(phdr->version < 3){
+-        phdr->oset_skiprecs = NULL;
++        phdr->oset_skiprecs = 0;
+         phdr->num_skiprecs = 0;
+         phdr->oset_datarecs = phdr->hdr_len;
+         phdr->num_datarecs = (phdr->sbuf.st_size - phdr->hdr_len)/
diff --git a/net/owamp/pkg/PLIST b/net/owamp/pkg/PLIST
index 09b2de62cd8..f88a5343cd6 100644
--- a/net/owamp/pkg/PLIST
+++ b/net/owamp/pkg/PLIST
@@ -1,5 +1,6 @@
 @newgroup _owampd:678
 @newuser _owampd:678:_owampd::owampd user:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/owampd
 @bin bin/aespasswd
 @bin bin/owampd
 bin/owfetch
@@ -29,8 +30,8 @@ include/I2util/sha1.h
 include/I2util/sha1P.h
 include/I2util/table.h
 include/I2util/util.h
-lib/libI2util.a
-lib/libowamp.a
+@static-lib lib/libI2util.a
+@static-lib lib/libowamp.a
 @man man/man1/aespasswd.1
 @man man/man1/owfetch.1
 @man man/man1/owping.1
@@ -53,4 +54,3 @@ share/examples/owampd/owampd.conf
 @sample ${SYSCONFDIR}/owampd/owampd.conf
 share/examples/owampd/owampd.limits
 @sample ${SYSCONFDIR}/owampd/owampd.limits
-@rcscript ${RCDIR}/owampd