diff --git a/converters/skf/Makefile b/converters/skf/Makefile
index 8606a17fc8667..3306f3f2ea552 100644
--- a/converters/skf/Makefile
+++ b/converters/skf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2012/03/17 15:03:29 obache Exp $
+# $NetBSD: Makefile,v 1.36 2012/04/12 13:50:22 obache Exp $
 
-DISTNAME=	skf_${VERSION}.5
-VERSION=	1.97
+DISTNAME=	skf_${VERSION}.0
+VERSION=	1.99
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	japanese converters
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=skf/55294/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=skf/55295/}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://sourceforge.jp/projects/skf/
diff --git a/converters/skf/PLIST b/converters/skf/PLIST
index 5548adc60b3f0..143b4afea6996 100644
--- a/converters/skf/PLIST
+++ b/converters/skf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/03/17 15:03:29 obache Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/04/12 13:50:23 obache Exp $
 bin/skf
 man/ja_JP.EUC/man1/skf.1
 man/ja_JP.UTF-8/man1/skf.1
@@ -11,6 +11,7 @@ share/doc/skf/doc/2.intenal_code.txt.gz
 share/doc/skf/doc/3.charset.txt.gz
 share/doc/skf/doc/4.moji_table.txt.gz
 share/doc/skf/doc/5.languages.txt.gz
+share/doc/skf/doc/6.Encoding.txt.gz
 share/locale/ja/LC_MESSAGES/skf.mo
 share/skf/lib/${VERSION}/iIM34@.stb
 share/skf/lib/${VERSION}/iIM34E.stb
@@ -102,7 +103,7 @@ share/skf/lib/${VERSION}/iIS44B.stb
 share/skf/lib/${VERSION}/iIS44C.stb
 share/skf/lib/${VERSION}/iIS44D.stb
 share/skf/lib/${VERSION}/iIS44E.stb
-share/skf/lib/${VERSION}/iNM343.stb
+share/skf/lib/${VERSION}/iNM34A.stb
 share/skf/lib/${VERSION}/iNM34B.stb
 share/skf/lib/${VERSION}/iNM34D.stb
 share/skf/lib/${VERSION}/iNM34E.stb
@@ -119,9 +120,6 @@ share/skf/lib/${VERSION}/iNM34Q.stb
 share/skf/lib/${VERSION}/iNM35C.stb
 share/skf/lib/${VERSION}/iNM35F.stb
 share/skf/lib/${VERSION}/iNM35G.stb
-share/skf/lib/${VERSION}/iNM35J.stb
-share/skf/lib/${VERSION}/iNM35K.stb
-share/skf/lib/${VERSION}/iNM35L.stb
 share/skf/lib/${VERSION}/iNS346.stb
 share/skf/lib/${VERSION}/iNS347.stb
 share/skf/lib/${VERSION}/iNS348.stb
@@ -196,18 +194,26 @@ share/skf/lib/${VERSION}/iNS37W.stb
 share/skf/lib/${VERSION}/iNS37X.stb
 share/skf/lib/${VERSION}/iNS37Y.stb
 share/skf/lib/${VERSION}/iNS37Z.stb
-share/skf/lib/${VERSION}/iOM447.stb
+share/skf/lib/${VERSION}/iOM44A.stb
 share/skf/lib/${VERSION}/iOM44J.stb
 share/skf/lib/${VERSION}/iOM44K.stb
 share/skf/lib/${VERSION}/iOM44L.stb
 share/skf/lib/${VERSION}/iOM44M.stb
 share/skf/lib/${VERSION}/iOM44N.stb
+share/skf/lib/${VERSION}/iOM44P.stb
+share/skf/lib/${VERSION}/iOM45H.stb
+share/skf/lib/${VERSION}/iOM45M.stb
+share/skf/lib/${VERSION}/iOM45N.stb
+share/skf/lib/${VERSION}/iOM45O.stb
 share/skf/lib/${VERSION}/iOM45P.stb
 share/skf/lib/${VERSION}/iOM45Q.stb
 share/skf/lib/${VERSION}/iOM45R.stb
 share/skf/lib/${VERSION}/iOM45V.stb
 share/skf/lib/${VERSION}/iOS44H.stb
 share/skf/lib/${VERSION}/iOS44I.stb
+share/skf/lib/${VERSION}/iOS45J.stb
+share/skf/lib/${VERSION}/iOS45K.stb
+share/skf/lib/${VERSION}/iOS45L.stb
 share/skf/lib/${VERSION}/oIMM7P.stb
 share/skf/lib/${VERSION}/oIMM@C.stb
 share/skf/lib/${VERSION}/oIMM@G.stb
@@ -266,6 +272,12 @@ share/skf/lib/${VERSION}/oIMNBG.stb
 share/skf/lib/${VERSION}/oIMNBK.stb
 share/skf/lib/${VERSION}/oIMNBL.stb
 share/skf/lib/${VERSION}/oIMNBN.stb
+share/skf/lib/${VERSION}/oIMNCB.stb
+share/skf/lib/${VERSION}/oIMNCC.stb
+share/skf/lib/${VERSION}/oIMNCG.stb
+share/skf/lib/${VERSION}/oIMNCK.stb
+share/skf/lib/${VERSION}/oIMNCL.stb
+share/skf/lib/${VERSION}/oIMNCN.stb
 share/skf/lib/${VERSION}/oIMNIC.stb
 share/skf/lib/${VERSION}/oIMNIG.stb
 share/skf/lib/${VERSION}/oIMNIK.stb
@@ -276,6 +288,22 @@ share/skf/lib/${VERSION}/oIMNJG.stb
 share/skf/lib/${VERSION}/oIMNJK.stb
 share/skf/lib/${VERSION}/oIMNJL.stb
 share/skf/lib/${VERSION}/oIMNJN.stb
+share/skf/lib/${VERSION}/oIMNJO.stb
+share/skf/lib/${VERSION}/oIMNJP.stb
+share/skf/lib/${VERSION}/oIMNKC.stb
+share/skf/lib/${VERSION}/oIMNKG.stb
+share/skf/lib/${VERSION}/oIMNKK.stb
+share/skf/lib/${VERSION}/oIMNKL.stb
+share/skf/lib/${VERSION}/oIMNKN.stb
+share/skf/lib/${VERSION}/oIMNKO.stb
+share/skf/lib/${VERSION}/oIMNKP.stb
+share/skf/lib/${VERSION}/oIMNLC.stb
+share/skf/lib/${VERSION}/oIMNLG.stb
+share/skf/lib/${VERSION}/oIMNLK.stb
+share/skf/lib/${VERSION}/oIMNLL.stb
+share/skf/lib/${VERSION}/oIMNLN.stb
+share/skf/lib/${VERSION}/oIMNLO.stb
+share/skf/lib/${VERSION}/oIMNLP.stb
 share/skf/lib/${VERSION}/oIMS4G.stb
 share/skf/lib/${VERSION}/oIMS4L.stb
 share/skf/lib/${VERSION}/oIMSAG.stb
@@ -404,12 +432,6 @@ share/skf/lib/${VERSION}/oNMM^G.stb
 share/skf/lib/${VERSION}/oNMM^K.stb
 share/skf/lib/${VERSION}/oNMM^L.stb
 share/skf/lib/${VERSION}/oNMM^N.stb
-share/skf/lib/${VERSION}/oNMNCB.stb
-share/skf/lib/${VERSION}/oNMNCC.stb
-share/skf/lib/${VERSION}/oNMNCG.stb
-share/skf/lib/${VERSION}/oNMNCK.stb
-share/skf/lib/${VERSION}/oNMNCL.stb
-share/skf/lib/${VERSION}/oNMNCN.stb
 share/skf/lib/${VERSION}/oNMNGC.stb
 share/skf/lib/${VERSION}/oNMNGG.stb
 share/skf/lib/${VERSION}/oNMNGH.stb
diff --git a/converters/skf/distinfo b/converters/skf/distinfo
index 468ccbd08b433..32db65f64e00f 100644
--- a/converters/skf/distinfo
+++ b/converters/skf/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.28 2012/03/17 15:03:29 obache Exp $
+$NetBSD: distinfo,v 1.29 2012/04/12 13:50:23 obache Exp $
 
-SHA1 (skf_1.97.5.tar.gz) = b81d6aa996c1d92e6345623eb6a7eddc974b932a
-RMD160 (skf_1.97.5.tar.gz) = 3ca901e9682ebddc40b1744db1ee2ee1a60a5ea0
-Size (skf_1.97.5.tar.gz) = 1269467 bytes
-SHA1 (patch-aa) = e4345cfc8a818ef0813297214866791b15d755f5
+SHA1 (skf_1.99.0.tar.gz) = 770f31db8dae041db32bd2a5f1f3ff94410d04a8
+RMD160 (skf_1.99.0.tar.gz) = 9ed92f7902f998582306ed119c15325728e2ed42
+Size (skf_1.99.0.tar.gz) = 1339266 bytes
+SHA1 (patch-aa) = 3b8a3c5acc6343c37e5c058cef8bc02abd51324a
+SHA1 (patch-configure) = e319baccd691421d3f718f8e82204bb92b77c324
diff --git a/converters/skf/patches/patch-aa b/converters/skf/patches/patch-aa
index 786ba4c7405e3..7315191f7962a 100644
--- a/converters/skf/patches/patch-aa
+++ b/converters/skf/patches/patch-aa
@@ -1,28 +1,30 @@
-$NetBSD: patch-aa,v 1.7 2010/02/07 13:17:55 obache Exp $
+$NetBSD: patch-aa,v 1.8 2012/04/12 13:50:23 obache Exp $
 
---- Makefile.in.orig	2010-01-09 15:37:45.000000000 +0000
+* fix localedir
+* fix manpath
+* enable locale
+
+--- Makefile.in.orig	2012-03-17 08:22:27.000000000 +0000
 +++ Makefile.in
-@@ -55,15 +55,16 @@ GNU_S_INCLUDE_DIR = @gnu_s_headers_dir@
+@@ -54,13 +54,14 @@ GNU_S_INCLUDE_DIR = @gnu_s_headers_dir@
  #
  DOCDIR		= $(datadir)/doc/@PACKAGE@
  #
--mandir = $(prefix)/$(manrawdir)
-+mandir = @mandir@
 +localedir= @localedir@
  
- LSFMANDIR	= $(datadir)/man
- MANCJDIR	= $(LSFMANDIR)/ja
- MANDIR		= $(mandir)/man1
--JOMANDIR	= $(mandir)/ja/man1
-+JOMANDIR	= $(mandir)/ja_JP.EUC/man1
- JMANDIR		= $(mandir)/ja_JP.UTF-8/man1
+-LSFMANDIR	= $(datadir)/man
++LSFMANDIR	= @mandir@
+ MANDIR		= $(LSFMANDIR)/man1
+-JOMANDIR	= $(LSFMANDIR)/ja/man1
++JOMANDIR	= $(LSFMANDIR)/ja_JP.EUC/man1
+ JMANDIR		= $(LSFMANDIR)/ja_JP.UTF-8/man1
  SKFTUTDIR	= $(DOCDIR)/doc
 -LOCALEDIR	= @localedir@
 +LOCALEDIR	= $(localedir)
  LOCALEJDIR	= "$(LOCALEDIR)/ja/LC_MESSAGES"
  SKFLIBDIR	= $(LSKFDIR)/lib
  
-@@ -111,8 +112,8 @@ CC = @CC@
+@@ -108,8 +109,8 @@ CC = @CC@
  
  SUBDIRS = 
  
diff --git a/converters/skf/patches/patch-configure b/converters/skf/patches/patch-configure
new file mode 100644
index 0000000000000..62fa74b46d64c
--- /dev/null
+++ b/converters/skf/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2012/04/12 13:50:23 obache Exp $
+
+* test(1) portability fix
+
+--- configure.orig	2012-03-17 14:02:47.000000000 +0000
++++ configure
+@@ -4621,7 +4621,7 @@ echo $ECHO_N "checking major version... 
+ 	* ) darwin_shared="-arch i386 -arch x86_64";
+ 		deployment_target=MACOSX_DEPLOYMENT_TARGET=10.6;;
+     esac
+-    if test "$mactiger" == "yes"; then
++    if test "$mactiger" = "yes"; then
+ 	deployment_target="MACOSX_DEPLOYMENT_TARGET=10.4"
+     fi
+ fi