diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
index 4ec636742588..b45adab74df3 100644
--- a/japanese/skkfep/Makefile
+++ b/japanese/skkfep/Makefile
@@ -6,20 +6,15 @@
 #
 
 PORTNAME=	skkfep
-PORTVERSION=	0.86c
-PORTREVISION=	3
+PORTVERSION=	0.87
 CATEGORIES=	japanese
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/s/skkfep
-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+MASTER_SITES=	http://homepage2.nifty.com/aito/skkfep/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SKK-like Kana-to-Kanji FrontEnd Processor
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skk
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 MAN1=		skkfep.1
 PLIST_FILES=	bin/skkfep
 
diff --git a/japanese/skkfep/distinfo b/japanese/skkfep/distinfo
index 1977cf7958d8..723a384c3992 100644
--- a/japanese/skkfep/distinfo
+++ b/japanese/skkfep/distinfo
@@ -1,2 +1,2 @@
-MD5 (skkfep_0.86c.orig.tar.gz) = 0e06d473b70bd0233e25195e062bb663
-SIZE (skkfep_0.86c.orig.tar.gz) = 46748
+MD5 (skkfep-0.87.tar.gz) = 558c273e3d6d546dc6fa0779563b7163
+SIZE (skkfep-0.87.tar.gz) = 45711
diff --git a/japanese/skkfep/files/patch-aa b/japanese/skkfep/files/patch-aa
index 5caf7ed9c12e..a63117dc7c22 100644
--- a/japanese/skkfep/files/patch-aa
+++ b/japanese/skkfep/files/patch-aa
@@ -1,18 +1,18 @@
---- config.h.orig	Tue Sep 22 01:45:27 1998
-+++ config.h	Wed Aug  2 02:50:39 2000
+--- config.h.orig	Wed Sep  3 08:50:18 2003
++++ config.h	Mon May 16 14:16:20 2005
 @@ -2,19 +2,19 @@
   * Configuration for SKKFEP
   */
  
--#include "configs/solaris2.h"
+-#include "configs/linux.h"
 +#include "configs/freebsd.h"
  
  #if makefile_parameter
 -CC=gcc
 +#CC=gcc
  DEFINE=-DUSE_LOCALE
--OPTIMIZE=-O
-+#OPTIMIZE=-O
+-OPTIMIZE=-g
++#OPTIMIZE=-g
  EXTRALIBS=
  #endif
  
diff --git a/japanese/skkfep/files/patch-stty.c b/japanese/skkfep/files/patch-stty.c
index 0ff3f9ed2a0d..3ff89dd37fda 100644
--- a/japanese/skkfep/files/patch-stty.c
+++ b/japanese/skkfep/files/patch-stty.c
@@ -1,11 +1,11 @@
---- stty.c.orig	Wed Sep 23 01:22:53 1998
-+++ stty.c	Sat Oct 11 22:25:59 2003
-@@ -309,7 +309,7 @@
- chld_changed()
+--- stty.c.orig	Wed Sep  3 08:49:32 2003
++++ stty.c	Mon May 16 14:18:07 2005
+@@ -306,7 +306,7 @@
  {
  	int cpid;
--#if defined(_AIX) || defined(SVR4)
-+#if defined(_AIX) || defined(SVR4) || defined(__FreeBSD__)
+ /* #ifdef _AIX */
+-#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2)
++#if defined(_AIX) || defined(NECEWS) || defined(SOLARIS2) || defined(__FreeBSD__)
  	int statusp;
- #else
- 	union wait statusp;
+ 	reset_tty_without_close();
+ 	cpid = wait(&statusp);
diff --git a/japanese/skkfep/pkg-descr b/japanese/skkfep/pkg-descr
index 6004d4dfca99..b07e1462b530 100644
--- a/japanese/skkfep/pkg-descr
+++ b/japanese/skkfep/pkg-descr
@@ -1,4 +1,6 @@
 skkfep is a tool to input Kana and Kanji from the terminal.
 This also include some patches for Word registration.
 
+WWW: http://homepage2.nifty.com/aito/soft.html
+
 -Yusuke NAWANO <azuki@azkey.org>