diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile
index 968f2a74eb0..4747985e410 100644
--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@@ -1,29 +1,32 @@
-# $OpenBSD: Makefile,v 1.7 2009/08/10 06:32:05 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2010/03/21 09:10:52 jasper Exp $
 
-COMMENT=japanese handwriting recognition
-CATEGORIES=japanese
-HOMEPAGE=http://www.gtk.org/~otaylor/kanjipad/
+COMMENT=	Japanese handwriting recognition
 
-DISTNAME=kanjipad-1.2.1
-PKGNAME=${DISTNAME}p1
-MASTER_SITES=ftp://ftp.gtk.org/pub/users/otaylor/kanjipad/
+DISTNAME=	kanjipad-2.0.0
+CATEGORIES=	japanese
 
-# GPL
+HOMEPAGE=	http://fishsoup.net/software/kanjipad/
+
+# GPLv2
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_PACKAGE_CDROM=Yes
 PERMIT_DISTFILES_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 
-LIB_DEPENDS=gmodule,gtk,gdk::x11/gtk+ \
-	glib::devel/glib
+MASTER_SITES=	${HOMEPAGE}
+
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += pthread-stubs xcb z
+
+LIB_DEPENDS=	gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
 
 MODULES=	devel/gettext
-WANTLIB=	X11 Xext Xi c m pthread-stubs xcb
-
 USE_X11=	Yes
 
 MAKE_FLAGS=OPTIMIZE='${CFLAGS}' PREFIX=${PREFIX}
-FAKE_FLAGS=PREFIX=${WRKINST}${TRUEPREFIX}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kanjipad
diff --git a/japanese/kanjipad/distinfo b/japanese/kanjipad/distinfo
index d1853056c6b..8a3ec15a7a4 100644
--- a/japanese/kanjipad/distinfo
+++ b/japanese/kanjipad/distinfo
@@ -1,5 +1,5 @@
-MD5 (kanjipad-1.2.1.tar.gz) = 3xLUk7S9s979/z15C2ibdA==
-RMD160 (kanjipad-1.2.1.tar.gz) = j63g9u+10OAnFcf46nlz8js20NE=
-SHA1 (kanjipad-1.2.1.tar.gz) = jdxCIjhv7rGE2uTFfcfsPpIq37w=
-SHA256 (kanjipad-1.2.1.tar.gz) = 4EJ55kW6zaD4/bQog9cw7GKts1TRULkTFEwsmuhNTx4=
-SIZE (kanjipad-1.2.1.tar.gz) = 74287
+MD5 (kanjipad-2.0.0.tar.gz) = vf51U0MihAs/9WbgqRxHLQ==
+RMD160 (kanjipad-2.0.0.tar.gz) = H6O4YYCSlXQQkUOzk2985xspjFY=
+SHA1 (kanjipad-2.0.0.tar.gz) = R32q6XWZbuEFykAfuAg7Y2/W0lw=
+SHA256 (kanjipad-2.0.0.tar.gz) = KCcvYewJxgejV442Junk/UPR2dHiHLZDKHRXZtAO6eE=
+SIZE (kanjipad-2.0.0.tar.gz) = 75930
diff --git a/japanese/kanjipad/patches/patch-Makefile b/japanese/kanjipad/patches/patch-Makefile
new file mode 100644
index 00000000000..2cce20cecef
--- /dev/null
+++ b/japanese/kanjipad/patches/patch-Makefile
@@ -0,0 +1,30 @@
+$OpenBSD: patch-Makefile,v 1.1 2010/03/21 09:10:52 jasper Exp $
+
+- Get rid of Gmake-isms.
+- Fix build by undefining GTK_DISABLE_DEPRECATED.
+
+--- Makefile.orig	Sun Aug 25 21:00:54 2002
++++ Makefile	Mon Feb  1 08:06:51 2010
+@@ -1,11 +1,11 @@
+ OPTIMIZE=-g -Wall
+ #OPTIMIZE=-O2 
+ 
+-GTKINC=$(shell pkg-config --cflags gtk+-2.0) -DG_DISABLE_DEPRECATED  -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+-GTKLIBS=$(shell pkg-config --libs gtk+-2.0)
+-GLIBLIBS=$(shell pkg-config --libs glib-2.0)
++GTKINC=`pkg-config --cflags gtk+-2.0` -DG_DISABLE_DEPRECATED  -DGDK_DISABLE_DEPRECATED
++GTKLIBS=`pkg-config --libs gtk+-2.0`
++GLIBLIBS=`pkg-config --libs glib-2.0`
+ 
+-PREFIX=/usr/local
++#PREFIX=/usr/local
+ DATADIR=$(PREFIX)/share
+ 
+ # location in which binaries are installed
+@@ -75,4 +75,4 @@ distcheck: dist
+ 	cd .. &&				\
+ 	rm -rf $$distdir
+ 
+-.PHONY: dist distcheck
+\ No newline at end of file
++.PHONY: dist distcheck
diff --git a/japanese/kanjipad/patches/patch-kanjipad_c b/japanese/kanjipad/patches/patch-kanjipad_c
index b5cd74fa086..bb09f071373 100644
--- a/japanese/kanjipad/patches/patch-kanjipad_c
+++ b/japanese/kanjipad/patches/patch-kanjipad_c
@@ -1,23 +1,12 @@
-$OpenBSD: patch-kanjipad_c,v 1.1.1.1 2005/07/16 12:33:50 espie Exp $
---- kanjipad.c.orig	Sat Jul 16 14:19:07 2005
-+++ kanjipad.c	Sat Jul 16 14:19:51 2005
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
- 
- #include "kanjipad.h"
-@@ -393,9 +394,9 @@ init_engine()
-       dup2 (out_fd[1], STDOUT_FILENO);
- 
-       if (data_file)
--	execlp ("kpengine","kpengine","--data-file", data_file, NULL);
-+	execlp ("kpengine","kpengine","--data-file", data_file, (char *)0);
-       else
--	execlp ("kpengine","kpengine", NULL);
-+	execlp ("kpengine","kpengine", (char *)0);
- 
-       g_error ("Couldn't exec kpengine: %s", g_strerror(errno));
+$OpenBSD: patch-kanjipad_c,v 1.2 2010/03/21 09:10:52 jasper Exp $
+--- kanjipad.c.orig	Mon Feb  1 07:55:13 2010
++++ kanjipad.c	Mon Feb  1 07:55:46 2010
+@@ -510,7 +510,7 @@ init_engine()
+   if (data_file)
+     argv[2] = data_file;
+   else
+-    argv[1] = NULL;
++    argv[1] = (char *)0;
  
+   if (!g_spawn_async_with_pipes (NULL, /* working directory */
+ 				 argv, NULL,	/* argv, envp */
diff --git a/japanese/kanjipad/pkg/PLIST b/japanese/kanjipad/pkg/PLIST
index db4399da65f..6850a670fe8 100644
--- a/japanese/kanjipad/pkg/PLIST
+++ b/japanese/kanjipad/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/07/16 12:33:50 espie Exp $
-bin/kanjipad
-bin/kpengine
+@comment $OpenBSD: PLIST,v 1.2 2010/03/21 09:10:52 jasper Exp $
+@bin bin/kanjipad
+@bin bin/kpengine
 share/doc/kanjipad/
 share/doc/kanjipad/README
 share/kanjipad/