diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 93218bf1336a..78642080e61a 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -36,7 +36,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 XEMACS_MAJOR_VER?=	21
 XEMACS_REL=		${XEMACS_MAJOR_VER}.4
-XEMACS_VER=		${XEMACS_MAJOR_VER}.4.11
+XEMACS_VER=		${XEMACS_MAJOR_VER}.4.12
 XEMACS_ARCH=		${CONFIGURE_TARGET}
 
 USE_XLIB=	yes
diff --git a/editors/xemacs-devel-mule/distinfo b/editors/xemacs-devel-mule/distinfo
index 86d7478cd4c7..656334adab9c 100644
--- a/editors/xemacs-devel-mule/distinfo
+++ b/editors/xemacs-devel-mule/distinfo
@@ -1,3 +1,3 @@
-MD5 (xemacs/xemacs-21.4.11-src.tar.gz) = 8bee7c02815ac197aaed611b7cae8428
-MD5 (xemacs/xemacs-21.4.11-elc.tar.gz) = e820faf1c5d00c3d58026d99505f0012
-MD5 (xemacs/xemacs-21.4.11-info.tar.gz) = 0c643cc716aa913371de52a080d258b8
+MD5 (xemacs/xemacs-21.4.12-src.tar.gz) = 2e2c1502b1eb76af094108988c626a0e
+MD5 (xemacs/xemacs-21.4.12-elc.tar.gz) = 6e0931158967f433e46546595bf72904
+MD5 (xemacs/xemacs-21.4.12-info.tar.gz) = d31805fc1cff0337d40b77422ba86923
diff --git a/editors/xemacs-devel-mule/pkg-descr b/editors/xemacs-devel-mule/pkg-descr
index 2724120e73dd..2d8d16342879 100644
--- a/editors/xemacs-devel-mule/pkg-descr
+++ b/editors/xemacs-devel-mule/pkg-descr
@@ -1,5 +1,5 @@
 This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.9), the next
+version(gamma) of XEmacs with Mule(version 21.4.12), the next
 generation of Emacs.
 
 This package is not built with any particular language support except for
diff --git a/editors/xemacs-devel-mule/pkg-descr.ja b/editors/xemacs-devel-mule/pkg-descr.ja
index b2aa7d144f58..398a41a1fb66 100644
--- a/editors/xemacs-devel-mule/pkg-descr.ja
+++ b/editors/xemacs-devel-mule/pkg-descr.ja
@@ -1,10 +1,10 @@
 This is a package containing only the executables for development
-version(gamma) of XEmacs with Mule(version 21.4.10), the next
+version(gamma) of XEmacs with Mule(version 21.4.12), the next
 generation of Emacs.
 
-You need to install a full package, xemacs-devel-mule-21.4.10, containing emacs
+You need to install a full package, xemacs-devel-mule-21.4.12, containing emacs
 executables, lisp files, info pages, and so on for XEmacs with Mule
-(version 21.4.10).
+(version 21.4.12).
 
 This package is built with Japanese support by using SKK, SJ3, Canna,
 FreeWnn or Wnn6 as an external input engine. Each input method would be
@@ -20,7 +20,7 @@ If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
 in advance. SKK is supported as already builtin. Also it will
 support several input methods under leim. 
 
-This package and the package xemacs-devel-mule-21.4.10, might clobber any
+This package and the package xemacs-devel-mule-21.4.12, might clobber any
 existing emacs installation.  In particular, the executables and man
 pages of etags/ctags are installed, and the info pages that come with
 the original emacs will be overwritten too.
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index c59b9b689ef1..5ec6a9047461 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -176,6 +176,8 @@ lib/xemacs-%%XEMACS_VER%%/etc/photos/dv.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/dvm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/fabrice.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/fabricem.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/golubev.png
+lib/xemacs-%%XEMACS_VER%%/etc/photos/golubevm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksic.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/hniksicm.png
 lib/xemacs-%%XEMACS_VER%%/etc/photos/jan.png
@@ -647,6 +649,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos3.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos4.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux7.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin.sc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin32.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/darwin.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf1-2.h
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index 38b7b0d65b63..93b59c405145 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -244,6 +244,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos3.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/bsdos4.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cxux7.h
+lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin.sc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/cygwin32.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/darwin.h
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s/decosf1-2.h