diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index c6217f79e1ee..19af0785522e 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs-devel-mule
 PORTVERSION=	${XEMACS_VER:S/-/./}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
diff --git a/editors/xemacs-devel-mule/files/patch-xgccache.c b/editors/xemacs-devel-mule/files/patch-xgccache.c
new file mode 100644
index 000000000000..bc0d7dbef59e
--- /dev/null
+++ b/editors/xemacs-devel-mule/files/patch-xgccache.c
@@ -0,0 +1,17 @@
+Index: src/xgccache.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xgccache.c,v
+retrieving revision 1.13
+diff -u -r1.13 xgccache.c
+--- src/xgccache.c	2005/11/26 11:46:11	1.13
++++ src/xgccache.c	2006/02/16 20:18:18
+@@ -233,7 +233,9 @@
+       cache->head = cell->next;
+       cache->head->prev = 0;
+       if (cache->tail == cell) cache->tail = 0; /* only one */
++#if 0
+       debug_out ("Cache full, freeing GC: %08lx\n  ", XE_GCONTEXT(cell));
++#endif
+       XFreeGC (cache->dpy, cell->gc);
+       cache->delete_count++;
+ #ifdef GCCACHE_HASH
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 9d34b1c2420c..47e93fd167c7 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xemacs-devel
 PORTVERSION=	${XEMACS_VER:S/-/./}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
diff --git a/editors/xemacs-devel/files/patch-xgccache.c b/editors/xemacs-devel/files/patch-xgccache.c
new file mode 100644
index 000000000000..bc0d7dbef59e
--- /dev/null
+++ b/editors/xemacs-devel/files/patch-xgccache.c
@@ -0,0 +1,17 @@
+Index: src/xgccache.c
+===================================================================
+RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xgccache.c,v
+retrieving revision 1.13
+diff -u -r1.13 xgccache.c
+--- src/xgccache.c	2005/11/26 11:46:11	1.13
++++ src/xgccache.c	2006/02/16 20:18:18
+@@ -233,7 +233,9 @@
+       cache->head = cell->next;
+       cache->head->prev = 0;
+       if (cache->tail == cell) cache->tail = 0; /* only one */
++#if 0
+       debug_out ("Cache full, freeing GC: %08lx\n  ", XE_GCONTEXT(cell));
++#endif
+       XFreeGC (cache->dpy, cell->gc);
+       cache->delete_count++;
+ #ifdef GCCACHE_HASH