diff --git a/lib/librumpuser/rumpuser_port.h b/lib/librumpuser/rumpuser_port.h
index 60a5ea2edaae..bcb79c6ef366 100644
--- a/lib/librumpuser/rumpuser_port.h
+++ b/lib/librumpuser/rumpuser_port.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.23 2013/12/18 20:24:04 pooka Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.24 2014/01/08 01:45:29 pooka Exp $	*/
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -94,7 +94,7 @@ clock_gettime(clockid_t clk, struct timespec *ts)
 
 /* maybe this should be !__NetBSD__ ? */
 #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)	\
-    || defined(__DragonFly__) || defined(__APPLE__) || defined(__CYGWIN__)
+    || defined(__DragonFly__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__CYGWIN__)
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/librumpuser/rumpuser_sp.c b/lib/librumpuser/rumpuser_sp.c
index 2c8e21bb82e3..0e100d703326 100644
--- a/lib/librumpuser/rumpuser_sp.c
+++ b/lib/librumpuser/rumpuser_sp.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_sp.c,v 1.61 2013/11/01 23:22:13 pooka Exp $	*/
+/*      $NetBSD: rumpuser_sp.c,v 1.62 2014/01/08 01:45:29 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -37,7 +37,7 @@
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_sp.c,v 1.61 2013/11/01 23:22:13 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_sp.c,v 1.62 2014/01/08 01:45:29 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -90,7 +90,7 @@ static char banner[MAXBANNER];
 
 
 /* how to use atomic ops on Linux? */
-#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__)
 static pthread_mutex_t discomtx = PTHREAD_MUTEX_INITIALIZER;
 
 static void
diff --git a/lib/librumpuser/sp_common.c b/lib/librumpuser/sp_common.c
index 9dc8a4cef5df..6273e89a0427 100644
--- a/lib/librumpuser/sp_common.c
+++ b/lib/librumpuser/sp_common.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: sp_common.c,v 1.37 2013/12/31 00:25:17 pooka Exp $	*/
+/*      $NetBSD: sp_common.c,v 1.38 2014/01/08 01:45:29 pooka Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -36,6 +36,7 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>