diff --git a/sys/rump/Makefile.rump b/sys/rump/Makefile.rump
index d9855aeb702c..7130a98ffe8f 100644
--- a/sys/rump/Makefile.rump
+++ b/sys/rump/Makefile.rump
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile.rump,v 1.18 2008/12/29 22:16:15 pooka Exp $
+#	$NetBSD: Makefile.rump,v 1.19 2008/12/30 19:05:40 pooka Exp $
 #
 
 WARNS?=		4
 NOLINT=		# kernel code
 
 # use kernel ABI instead of rump ABI (needs md code)
-.if ${MACHINE_ARCH} != "i386"
+.if ${MACHINE_ARCH} != "i386" && \
+    ${MACHINE_ARCH} != "x86_64"
 CPPFLAGS:=	-I${RUMPTOP}/include ${CPPFLAGS}
 .endif
 
diff --git a/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc b/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
new file mode 100644
index 000000000000..4574ada2f81d
--- /dev/null
+++ b/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile.inc,v 1.1 2008/12/30 19:05:40 pooka Exp $
+#
+
+.PATH:	${ARCHDIR}/../i386
+SRCS+=	cpu.c spl.c