diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi
index fde7a4bec..3c561cf5c 100644
--- a/distrib/sets/lists/minix-base/mi
+++ b/distrib/sets/lists/minix-base/mi
@@ -46,6 +46,7 @@
 ./bin/readclock                                         minix-base
 ./bin/rm                                                minix-base
 ./bin/rmdir                                             minix-base
+./bin/rump.dd                                           minix-base      rump
 ./bin/service                                           minix-base
 ./bin/setup                                             minix-base
 ./bin/sh                                                minix-base
@@ -195,6 +196,8 @@
 ./sbin/ping                                             minix-base
 ./sbin/poweroff                                         minix-base
 ./sbin/reboot                                           minix-base
+./sbin/rump.ping                                        minix-base      rump
+./sbin/rump.sysctl                                      minix-base      rump
 ./sbin/shutdown                                         minix-base
 ./sbin/sysctl                                           minix-base
 ./service                                               minix-base
@@ -1212,6 +1215,7 @@
 ./usr/sbin/postinstall                                  minix-base
 ./usr/sbin/pwd_mkdb                                     minix-base
 ./usr/sbin/rdate                                        minix-base
+./usr/sbin/rump.traceroute                              minix-base      rump
 ./usr/sbin/syslogd                                      minix-base
 ./usr/sbin/traceroute                                   minix-base
 ./usr/sbin/unlink                                       minix-base
diff --git a/lib/librumpclient/rumpclient.c b/lib/librumpclient/rumpclient.c
index 4a097f204..e4f348459 100644
--- a/lib/librumpclient/rumpclient.c
+++ b/lib/librumpclient/rumpclient.c
@@ -73,10 +73,19 @@ __RCSID("$NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $");
 #if defined(__minix)
 #define _MTHREADIFY_PTHREADS
 #include <minix/mthread.h>
+/* XXX: This is a really, really bad idea. */
+#include <signal.h>
+#undef pthread_sigmask
+#define pthread_sigmask sigprocmask
+int __libc_thr_sigsetmask_stub(int h, const sigset_t *s, sigset_t *o);
+int __libc_thr_sigsetmask_stub(int h, const sigset_t *s, sigset_t *o)
+{
+	return sigprocmask(h, s, o);
+}
 #else
 #include <pthread.h>
-#endif
 #include <signal.h>
+#endif
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index efeba908f..c2ed42756 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -19,6 +19,7 @@ BINMODE?=	755
 NONBINMODE?=	644
 MANDIR?=	/usr/man
 BINGRP?=	operator
+RUMPBINGRP?=	operator
 MANGRP?=	operator
 INFOGRP?=	operator
 DOCGRP?=	operator
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 78a1bcae6..06795d4ec 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -378,15 +378,6 @@ LDSTATIC=	-dynamic
 .endif
 
 .if defined(RUMPPRG)
-. if defined(__MINIX)
-PROG=			${RUMPPRG}
-PROGS=			${RUMPPRG}
-.  if defined(SRCS)
-SRCS+=			${PROG}_hostops.c
-.  else
-SRCS=			${PROG}.c ${PROG}_hostops.c
-. endif
-.else
 PROG=			${RUMPPRG}
 . ifndef CRUNCHEDPROG
 .  if (${MKRUMP} != "no")
@@ -407,7 +398,11 @@ SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
 .  endif
 .   if (${MKRUMP} != "no")
 DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
+.if defined(__MINIX)
+LDADD.rump.${PROG}+=	-lrumpclient -lmthread
+.else
 LDADD.rump.${PROG}+=	-lrumpclient
+.endif
 DPADD.rump.${PROG}+=	${LIBRUMPCLIENT}
 MAN.rump.${PROG}=	# defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined
@@ -417,7 +412,6 @@ PROGS=			${PROG}
 CPPFLAGS+=		-DCRUNCHOPS
 . endif
 .endif
-.endif
 
 .if defined(PROG)
 _CCLINK?=	${CC} ${_CCLINKFLAGS}