diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index 8a9be0d1cc92..f67ffb1d5443 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20020909.6
+PORTVERSION=	4.0.6.0.20041122.1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	egg_4.0.6+0.20020909cvs.orig
+DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20020909cvs-6.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 
 EMACS_PORT_NAME?=	emacs21
 
-WRKSRC=		${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
+WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
@@ -42,7 +42,6 @@ pre-configure:
 	    ${WRKSRC}/configure
 
 post-install:
-	${TOUCH} ${ELISPDIR}/egg/egg/.nosearch
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
index 253be31444a4..d257f9922f58 100644
--- a/editors/tamago-emacs21/distinfo
+++ b/editors/tamago-emacs21/distinfo
@@ -1,4 +1,4 @@
-MD5 (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 7ca91fc186c86a22fbaff9a55c58c433
-SIZE (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 277819
-MD5 (egg_4.0.6+0.20020909cvs-6.diff.gz) = 82ce2b2530349eaa683d434cff87e296
-SIZE (egg_4.0.6+0.20020909cvs-6.diff.gz) = 13240
+MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
+SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
+MD5 (egg_4.0.6+0.20041122cvs-1.diff.gz) = c0f4798fe1c3e406bfcac467c0054823
+SIZE (egg_4.0.6+0.20041122cvs-1.diff.gz) = 13845
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
index 13ace1a4f0a8..96adfaff9a11 100644
--- a/editors/tamago-emacs21/pkg-plist
+++ b/editors/tamago-emacs21/pkg-plist
@@ -32,6 +32,7 @@
 %%ELISPDIR%%/egg/its-keydef.elc
 %%ELISPDIR%%/egg/its.el
 %%ELISPDIR%%/egg/its.elc
+%%ELISPDIR%%/egg/its/.nosearch
 %%ELISPDIR%%/egg/its/ascii.el
 %%ELISPDIR%%/egg/its/ascii.elc
 %%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
@@ -50,6 +51,8 @@
 %%ELISPDIR%%/egg/its/hira.elc
 %%ELISPDIR%%/egg/its/jeonkak.el
 %%ELISPDIR%%/egg/its/jeonkak.elc
+%%ELISPDIR%%/egg/its/jiskana.el
+%%ELISPDIR%%/egg/its/jiskana.elc
 %%ELISPDIR%%/egg/its/kata.el
 %%ELISPDIR%%/egg/its/kata.elc
 %%ELISPDIR%%/egg/its/pinyin.el
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 8a9be0d1cc92..f67ffb1d5443 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20020909.6
+PORTVERSION=	4.0.6.0.20041122.1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	egg_4.0.6+0.20020909cvs.orig
+DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20020909cvs-6.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 
 EMACS_PORT_NAME?=	emacs21
 
-WRKSRC=		${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
+WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
@@ -42,7 +42,6 @@ pre-configure:
 	    ${WRKSRC}/configure
 
 post-install:
-	${TOUCH} ${ELISPDIR}/egg/egg/.nosearch
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo
index 253be31444a4..d257f9922f58 100644
--- a/editors/tamago/distinfo
+++ b/editors/tamago/distinfo
@@ -1,4 +1,4 @@
-MD5 (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 7ca91fc186c86a22fbaff9a55c58c433
-SIZE (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 277819
-MD5 (egg_4.0.6+0.20020909cvs-6.diff.gz) = 82ce2b2530349eaa683d434cff87e296
-SIZE (egg_4.0.6+0.20020909cvs-6.diff.gz) = 13240
+MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
+SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
+MD5 (egg_4.0.6+0.20041122cvs-1.diff.gz) = c0f4798fe1c3e406bfcac467c0054823
+SIZE (egg_4.0.6+0.20041122cvs-1.diff.gz) = 13845
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index 13ace1a4f0a8..96adfaff9a11 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -32,6 +32,7 @@
 %%ELISPDIR%%/egg/its-keydef.elc
 %%ELISPDIR%%/egg/its.el
 %%ELISPDIR%%/egg/its.elc
+%%ELISPDIR%%/egg/its/.nosearch
 %%ELISPDIR%%/egg/its/ascii.el
 %%ELISPDIR%%/egg/its/ascii.elc
 %%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
@@ -50,6 +51,8 @@
 %%ELISPDIR%%/egg/its/hira.elc
 %%ELISPDIR%%/egg/its/jeonkak.el
 %%ELISPDIR%%/egg/its/jeonkak.elc
+%%ELISPDIR%%/egg/its/jiskana.el
+%%ELISPDIR%%/egg/its/jiskana.elc
 %%ELISPDIR%%/egg/its/kata.el
 %%ELISPDIR%%/egg/its/kata.elc
 %%ELISPDIR%%/egg/its/pinyin.el