diff --git a/sys/rump/librump/rumpkern/locks.c b/sys/rump/librump/rumpkern/locks.c
index b1b8cf5864dc..a2922622bff8 100644
--- a/sys/rump/librump/rumpkern/locks.c
+++ b/sys/rump/librump/rumpkern/locks.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $	*/
+/*	$NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -37,6 +37,12 @@ __KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.68 2014/03/11 00:59:38 pooka Exp $");
 
 #include "rump_private.h"
 
+#ifdef LOCKDEBUG
+const int rump_lockdebug = 1;
+#else
+const int rump_lockdebug = 0;
+#endif
+
 /*
  * Simple lockdebug.  If it's compiled in, it's always active.
  * Currently available only for mtx/rwlock.
diff --git a/sys/rump/librump/rumpkern/rump.c b/sys/rump/librump/rumpkern/rump.c
index 8cbef4d4d3ff..faf87dce7dd7 100644
--- a/sys/rump/librump/rumpkern/rump.c
+++ b/sys/rump/librump/rumpkern/rump.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.299 2014/04/25 13:20:45 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.300 2014/04/25 18:13:59 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.299 2014/04/25 13:20:45 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.300 2014/04/25 18:13:59 pooka Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -111,11 +111,6 @@ static struct lwp *bootlwp;
 
 static char rump_msgbuf[16*1024]; /* 16k should be enough for std rump needs */
 
-#ifdef LOCKDEBUG
-const int rump_lockdebug = 1;
-#else
-const int rump_lockdebug = 0;
-#endif
 bool rump_ttycomponent = false;
 
 static void