diff --git a/japanese/kdrill/Makefile b/japanese/kdrill/Makefile
index a672de933182..80706ce1f127 100644
--- a/japanese/kdrill/Makefile
+++ b/japanese/kdrill/Makefile
@@ -1,49 +1,49 @@
 # New ports collection makefile for:	kdrill
 # Date created:		14 November 2000
 # Whom:			Seth Kingsley <sethk@osd.bsdi.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kdrill
-PORTVERSION=	5.12.2
+PORTVERSION=	6.0
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.bolthole.com/kdrill/
+MASTER_SITES=	http://www.bolthole.com/kdrill/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	sethk@meowfishies.com
 
 # Explictly state HTML'ized man pages in packing list since not all are
 # generated from imake.
 XFREE86_HTML_MAN=no
 MAN1=		kdrill.1 makedic.1 makeedict.1
 
 MANCOMPRESSED=	yes
 USE_IMAKE=	yes
 MAKE_ENV+=	LOCALBASE=${LOCALBASE}
 
 RUN_DEPENDS+=	xjdic:${PORTSDIR}/japanese/edict
 
 post-build:
 	@cd ${WRKSRC}/makedic && ${MAKE} ${MAKE_ENV} clean all
 
 DATADIR=	${PREFIX}/share/dict/kdrill
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/makedic/makedic ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/makedic/makeedict ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${INSTALL_MAN} ${WRKSRC}/makedic/makedic.1 \
 	    ${PREFIX}/man/man1
 	${GZIP_CMD} ${PREFIX}/man/man1/makedic.1
 	${INSTALL_MAN} ${WRKSRC}/makedic/makeedict.1 \
 	    ${PREFIX}/man/man1
 	${GZIP_CMD} ${PREFIX}/man/man1/makeedict.1
 .endif
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/makedic/fullkatahira.edic ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/makedic/hira.edic ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/makedic/hiraplus.edic ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/makedic/kata.edic ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/makedic/kataplus.edic ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/kdrill/distinfo b/japanese/kdrill/distinfo
index 62d70eda29a9..6ebeb5f86d6c 100644
--- a/japanese/kdrill/distinfo
+++ b/japanese/kdrill/distinfo
@@ -1 +1 @@
-MD5 (kdrill5.12.2.tar.gz) = 3707f5124f4ae5355a7bdd527e7972fa
+MD5 (kdrill6.0.tar.gz) = b8548cf231edd8c7f70ee908085ef070
diff --git a/japanese/kdrill/files/patch-Imakefile b/japanese/kdrill/files/patch-Imakefile
index 6fc330790a3c..1735515b640d 100644
--- a/japanese/kdrill/files/patch-Imakefile
+++ b/japanese/kdrill/files/patch-Imakefile
@@ -1,13 +1,15 @@
---- Imakefile.orig	Sun Nov 12 00:57:27 2000
-+++ Imakefile	Sun Nov 12 03:38:54 2000
-@@ -32,8 +32,8 @@
+--- Imakefile.orig	Tue Oct  1 01:15:31 2002
++++ Imakefile	Tue Oct  1 01:46:07 2002
+@@ -32,9 +32,9 @@
  /* 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
  
  # If for some reason, the user prefs stuff isn't working for you, 
  # and you can't compile, uncomment this