diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index 46abb8d18e97..a2e6d93be959 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/05/17 22:20:15 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/05/17 22:22:52 jlam Exp $
 #
 # Canna common makefile.
 #
@@ -19,7 +19,6 @@ PATCHDIR=	${.CURDIR}/../canna/patches
 .include "../canna/Makefile.version"
 
 USE_TOOLS+=	imake
-USE_X11BASE=	yes
 CANNA_SPOOL=	${DESTDIR}/var/spool/canna
 CANNA_MODE=	0755
 
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index b827a7295d58..4ea356da6fd9 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.10 2005/05/12 21:03:46 jlam Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.11 2005/05/17 22:22:52 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -7,7 +7,7 @@
 # ${PREFIX} selection
 ############################################################################
 
-.if defined(USE_IMAKE)
+.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)
 INSTALL_TARGET+=	${NO_INSTALL_MANPAGES:D:Uinstall.man}
 USE_X11BASE?=		implied
 PLIST_SUBST+=		IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}