diff --git a/sysutils/ruby-shadow/Makefile b/sysutils/ruby-shadow/Makefile
index 97127494d35..33b2b93fd0e 100644
--- a/sysutils/ruby-shadow/Makefile
+++ b/sysutils/ruby-shadow/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2015/10/09 07:06:35 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2015/11/19 15:01:47 jasper Exp $
 
 COMMENT =		module to access shadow passwords
 
 DISTNAME =		ruby-shadow-2.5.0
 PKGNAME =		${DISTNAME:S/ruby-//}
+REVISION =		0
 CATEGORIES =		sysutils
 
 MAINTAINER =		Jasper Lievisse Adriaanse <jasper@openbsd.org>
diff --git a/sysutils/ruby-shadow/patches/patch-pwd_shadow_c b/sysutils/ruby-shadow/patches/patch-pwd_shadow_c
new file mode 100644
index 00000000000..b9367caa3d7
--- /dev/null
+++ b/sysutils/ruby-shadow/patches/patch-pwd_shadow_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-pwd_shadow_c,v 1.6 2015/11/19 15:01:47 jasper Exp $
+--- pwd/shadow.c.orig	Thu Nov 19 15:51:37 2015
++++ pwd/shadow.c	Thu Nov 19 15:56:27 2015
+@@ -92,7 +92,11 @@ rb_shadow_getspnam(VALUE self, VALUE name)
+ 
+   if( TYPE(name) != T_STRING )
+     rb_raise(rb_eException,"argument must be a string.");
++#ifdef __OpenBSD__
++  entry = getpwnam_shadow(StringValuePtr(name));
++#else
+   entry = getpwnam(StringValuePtr(name));
++#endif
+ 
+   if( entry == NULL )
+     return Qnil;