diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile
index 8968081e2cf4..2b5a06a8b1b0 100644
--- a/japanese/kdrill/Makefile
+++ b/japanese/kdrill/Makefile
@@ -1,42 +1,47 @@
 PORTNAME=	kdrill
 PORTVERSION=	6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.bolthole.com/kdrill/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to quiz you on the meanings of Kanji
 WWW=		http://www.bolthole.com/kdrill/
 
+LICENSE=	CUSTOM
+LICENSE_NAME=	kdrill license
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 RUN_DEPENDS=	xjdic:japanese/edict
 
 USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 DATADIR=	${PREFIX}/share/dict/kdrill
 MAKE_ARGS=	MANDIR=${PREFIX}/share/man/man1
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-build:
 	@(cd ${WRKSRC}/makedic && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-install:
 .for i in makedic makeedict
 	(cd ${WRKSRC}/makedic && ${INSTALL_PROGRAM} ${i} \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC}/makedic && ${INSTALL_MAN} ${i}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1)
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in fullkatahira.edic hira.edic hiraplus.edic kata.edic kataplus.edic
 	(cd ${WRKSRC}/makedic && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${DATADIR})
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/kdrill/files/patch-Imakefile b/japanese/kdrill/files/patch-Imakefile
index f5d84d3b7476..ce9811b95de5 100644
--- a/japanese/kdrill/files/patch-Imakefile
+++ b/japanese/kdrill/files/patch-Imakefile
@@ -1,27 +1,27 @@
 --- Imakefile.orig	2006-03-05 22:05:00 UTC
 +++ Imakefile
 @@ -32,9 +32,9 @@ UNCOMPRESSEXT = .gz
  /* You can change these here, and KDrill.ad will 
   * get created with the matching values. Yaaay!
   */
 -DICTLOCATION= /usr/local/lib/kanjidic.gz
 -EDICTLOCATION= /usr/local/lib/edict.gz
 -RADLOCATION= /usr/local/lib/radkfile
 +DICTLOCATION= $(LOCALBASE)/share/dict/edict/kanjidic
 +EDICTLOCATION= $(LOCALBASE)/share/dict/edict/edict
-+RADLOCATION= $(LOCALBASE/share/dict/edict/radkfile
++RADLOCATION= $(LOCALBASE)/share/dict/edict/radkfile
  
  # If for some reason, the user prefs stuff isn't working for you, 
  # and you can't compile, uncomment this
 @@ -46,7 +46,10 @@ RADLOCATION= /usr/local/lib/radkfile
  # The system should pick some default for you.
  # If you dont like it, uncomment this and use it as you like.
  # This isn't compiled in anywhere, it's just a convenience thing.
 -# BINDIR = /usr/local/bin/X11
 +BINDIR = $(PREFIX)/bin
 +LIBDIR = $(PREFIX)/lib/X11
 +CONFIGDIR = $(LOCALBASE)/lib/X11/config
 +MANPATH = $(PREFIX)/man