diff --git a/sbin/cgdconfig/Makefile b/sbin/cgdconfig/Makefile
index 3383f351341f..5e78d217c28e 100644
--- a/sbin/cgdconfig/Makefile
+++ b/sbin/cgdconfig/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/09/08 21:36:35 pooka Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/19 15:03:34 pooka Exp $
 
 PROG=	cgdconfig
 MAN=	cgdconfig.8
 
-SRCS+=	cgd_kernelops.c
-
 .include "${.CURDIR}/Makefile.cgdconfig"
 
 .include <bsd.prog.mk>
diff --git a/sbin/cgdconfig/Makefile.cgdconfig b/sbin/cgdconfig/Makefile.cgdconfig
index 85711e939fe3..3dfa5d81eeca 100644
--- a/sbin/cgdconfig/Makefile.cgdconfig
+++ b/sbin/cgdconfig/Makefile.cgdconfig
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.cgdconfig,v 1.1 2009/09/08 21:36:35 pooka Exp $
+#	$NetBSD: Makefile.cgdconfig,v 1.2 2009/12/19 15:03:34 pooka Exp $
 #
 
 SRCS+=	cgdconfig.c		\
@@ -22,3 +22,11 @@ CGDCONFIGDIR=	${NETBSDSRCDIR}/sbin/cgdconfig
 .PATH:	${CGDCONFIGDIR}
 
 CPPFLAGS+=	-I${CGDCONFIGDIR}
+
+.ifdef RUMP_ACTION
+LDADD+= -lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpcrypto
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
+SRCS+=	cgd_rumpops.c
+.else
+SRCS+=	cgd_kernelops.c
+.endif
diff --git a/share/examples/rump/img2cgd/cgd_rumpops.c b/sbin/cgdconfig/cgd_rumpops.c
similarity index 93%
rename from share/examples/rump/img2cgd/cgd_rumpops.c
rename to sbin/cgdconfig/cgd_rumpops.c
index a8ed6041e61c..5b6256ddac0b 100644
--- a/share/examples/rump/img2cgd/cgd_rumpops.c
+++ b/sbin/cgdconfig/cgd_rumpops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgd_rumpops.c,v 1.1 2009/09/08 21:48:25 pooka Exp $	*/
+/*	$NetBSD: cgd_rumpops.c,v 1.1 2009/12/19 15:03:34 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: cgd_rumpops.c,v 1.1 2009/09/08 21:48:25 pooka Exp $");
+__RCSID("$NetBSD: cgd_rumpops.c,v 1.1 2009/12/19 15:03:34 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff --git a/share/examples/rump/img2cgd/Makefile b/share/examples/rump/img2cgd/Makefile
index 1c70e778ffde..6a9b59d3c4c3 100644
--- a/share/examples/rump/img2cgd/Makefile
+++ b/share/examples/rump/img2cgd/Makefile
@@ -1,16 +1,14 @@
 PROG=	img2cgd
-SRCS=	img2cgd.c cgd_rumpops.c
+SRCS=	img2cgd.c
 NOMAN=
 
 .include <bsd.own.mk>
 
+RUMP_ACTION=	#defined
+CPPFLAGS+=	-DCGDCONFIG_AS_LIB
 .include "${NETBSDSRCDIR}/sbin/cgdconfig/Makefile.cgdconfig"
 
-LDADD+=	-lrumpdev_cgd -lrumpdev_disk -lrumpdev -lrumpcrypto
-LDADD+=	-lrumpvfs -lrump -lrumpuser -lpthread
-
-CPPFLAGS+=	-DCGDCONFIG_AS_LIB
-
-DBG=-g -O0
+DBG=	-g -O0
+WARNS=	3
 
 .include <bsd.prog.mk>