diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi
index b89a5ad03..edb9f19de 100644
--- a/distrib/sets/lists/minix-base/mi
+++ b/distrib/sets/lists/minix-base/mi
@@ -869,6 +869,9 @@
 ./usr/lib/librefuse.so                                  minix-base
 ./usr/lib/librefuse.so.2                                minix-base
 ./usr/lib/librefuse.so.2.0                              minix-base
+./usr/lib/librump.so.0.0                                minix-base      rump
+./usr/lib/librump.so.0                                  minix-base      rump
+./usr/lib/librump.so                                    minix-base      rump
 ./usr/lib/librumpfs_cd9660.so.0.0                       minix-base      rump
 ./usr/lib/librumpfs_cd9660.so.0                         minix-base      rump
 ./usr/lib/librumpfs_cd9660.so                           minix-base      rump
diff --git a/distrib/sets/lists/minix-comp/mi b/distrib/sets/lists/minix-comp/mi
index 40831b0a2..ef9fbe367 100644
--- a/distrib/sets/lists/minix-comp/mi
+++ b/distrib/sets/lists/minix-comp/mi
@@ -2294,6 +2294,8 @@
 ./usr/lib/librefuse.a                                   minix-comp
 ./usr/lib/librefuse_pic.a                               minix-comp
 ./usr/lib/librmt.a                                      minix-comp
+./usr/lib/librump.a                                     minix-comp      rump
+./usr/lib/librump_pic.a                                 minix-comp      rump
 ./usr/lib/librumpfs_cd9660.a                            minix-comp      rump
 ./usr/lib/librumpfs_cd9660_pic.a                        minix-comp      rump
 ./usr/lib/librumpfs_efs.a                               minix-comp      rump
diff --git a/distrib/sets/lists/minix-man/mi b/distrib/sets/lists/minix-man/mi
index f87267a7f..1a8ff5958 100644
--- a/distrib/sets/lists/minix-man/mi
+++ b/distrib/sets/lists/minix-man/mi
@@ -2713,6 +2713,8 @@
 ./usr/man/man3/roundl.3                                 minix-man
 ./usr/man/man3/rresvport.3                              minix-man
 ./usr/man/man3/rresvport_af.3                           minix-man
+./usr/man/man3/rump.3                                   minix-man       rump
+./usr/man/man3/rump_lwproc.3                            minix-man       rump
 ./usr/man/man3/ruserok.3                                minix-man
 ./usr/man/man3/saslc.d.3                                minix-man       crypto
 ./usr/man/man3/saslc_alloc.3                            minix-man       crypto
diff --git a/lib/Makefile b/lib/Makefile
index 7410097c2..5585fbfd2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -255,7 +255,7 @@ SUBDIR+=	libform		# depends on libcurses
 SUBDIR+=	libmenu		# depends on libcurses
 #SUBDIR+=	libradius	# depends on libcrypto if (${MKCRYPTO} != "no")
 .if (${MKRUMP} != "no")
-#SUBDIR+=	librump		# depends on librumpuser
+SUBDIR+=	librump		# depends on librumpuser
 .endif
 
 .if (${MKKERBEROS} != "no")
diff --git a/lib/librump/Makefile b/lib/librump/Makefile
new file mode 100644
index 000000000..8f6815ee6
--- /dev/null
+++ b/lib/librump/Makefile
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.5 2014/11/09 17:39:37 pooka Exp $
+#
+
+RUMPTOP=	${.CURDIR}/../../sys/rump
+
+#LIBDPLIBS+=     rumpuser ${.CURDIR}/../librumpuser
+
+WARNS=		3	# XXX: kernel isn't ready for -Wsign-compare
+
+.include "${RUMPTOP}/librump/rumpkern/Makefile.rumpkern"