diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 77535ab8ed51..04cbc235c035 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += colorstep
     SUBDIR += engradient
     SUBDIR += fltk
+    SUBDIR += fltk-xunicode
     SUBDIR += fox
     SUBDIR += gnome--
     SUBDIR += gnome-look
diff --git a/x11-toolkits/fltk-xunicode/Makefile b/x11-toolkits/fltk-xunicode/Makefile
new file mode 100644
index 000000000000..c62b25083376
--- /dev/null
+++ b/x11-toolkits/fltk-xunicode/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	fltk-xunicode
+# Date created:		25 Aug 2000
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+MASTERDIR=	${.CURDIR}/../fltk
+
+WITH_XUNICODE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fltk-xunicode/pkg-comment b/x11-toolkits/fltk-xunicode/pkg-comment
new file mode 100644
index 000000000000..4ef986a2c8fc
--- /dev/null
+++ b/x11-toolkits/fltk-xunicode/pkg-comment
@@ -0,0 +1 @@
+FLTK with Unicode support
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 1717ee91ccc6..b9fd01a20373 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION= 	1.0.9
+PORTVERSION?=	${_PORTVERSION}
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
 		ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
@@ -14,16 +14,33 @@ MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
 		ftp://ftp.northamerica.net/pub/ESP/fltk/${VERSION}/ \
 		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERSION}/ \
 		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERSION}/
-DISTNAME=	${PKGNAME}-source
+DISTNAME=	${PORTNAME}-${VERSION}-source
 
 MAINTAINER=	dima@chg.ru
 
+.if defined(WITH_XUNICODE)
+PATCH_VERSION=	20000625
+_PORTVERSION+=	${VERSION}.${PATCH_VERSION}
+
+PKGNAMESUFFIX=	-xunicode
+
+PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fltk/
+PATCHFILES=	${PORTNAME}-${VERSION}${PKGNAMESUFFIX}-${PATCH_VERSION}.diff.gz
+PATCH_DIST_STRIP=	-p1
+
+EXTRA_PATCHES=	${PATCHDIR}/xunicode.patch-*
+
+BUILD_DEPENDS=	${X11BASE}/lib/libxunicode.a:${PORTSDIR}/converters/xunicode
+.else
+_PORTVERSION+=	${VERSION}
+.endif
+
 VERSION=	1.0.9
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 MAN1=		fluid.1
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index f976e1ebd711..eb3917787909 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1 +1,2 @@
 MD5 (fltk-1.0.9-source.tar.bz2) = 139c134098128754f706b4f3a905cbc5
+MD5 (fltk-1.0.9-xunicode-20000625.diff.gz) = 4c8282e0287b3fa13b7693b23a436320
diff --git a/x11-toolkits/fltk/files/xunicode.patch-aa b/x11-toolkits/fltk/files/xunicode.patch-aa
new file mode 100644
index 000000000000..6093036e590a
--- /dev/null
+++ b/x11-toolkits/fltk/files/xunicode.patch-aa
@@ -0,0 +1,25 @@
+--- makeinclude.in.orig	Fri Aug 25 14:06:06 2000
++++ makeinclude.in	Fri Aug 25 14:24:57 2000
+@@ -31,8 +31,11 @@
+ libdir		=@libdir@
+ srcdir		=@srcdir@
+ VPATH		=@srcdir@
+-XUNIDIR		=@prefix@/xunicode
+-INCLUDE		=-I.. -I$(XUNIDIR)/include
++XUNIINCDIR	=@prefix@/include/xunicode
++XUNILIBDIR	=@prefix@/lib
++INCLUDE		=-I.. -I$(XUNIINCDIR)
++
++MAKEFLAGS:=	${MAKEFLAGS} UNILIBDIR="${UNILIBDIR}"
+ 
+ # compiler names:
+ CXX		=@CXX@
+@@ -51,7 +54,7 @@
+ DSOCOMMAND	=@DSOCOMMAND@
+ 
+ # libraries to link with:
+-ADDLIBS		=$(XUNIDIR)/lib/libxunicode.a #-lxpg4
++ADDLIBS		=$(XUNILIBDIR)/libxunicode.a #-lxpg4
+ LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ $(ADDLIBS) -lm
+ GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ $(ADDLIBS) -lm
+ 
diff --git a/x11-toolkits/fltk/files/xunicode.patch-ab b/x11-toolkits/fltk/files/xunicode.patch-ab
new file mode 100644
index 000000000000..8339c3bdf9c1
--- /dev/null
+++ b/x11-toolkits/fltk/files/xunicode.patch-ab
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	Tue Jun  6 06:21:03 2000
++++ src/Makefile	Fri Aug 25 14:17:18 2000
+@@ -161,7 +161,7 @@
+ 
+ libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+-	$(DSOCOMMAND) $@ $(OBJECTS)
++	$(DSOCOMMAND) $@ $(OBJECTS) -L${XUNILIBDIR} -lxunicode
+ 
+ clean :
+ 	-@ rm -f *.o *.do $(DSONAME) $(LIBRARY) $(CLEAN) core *~ ../include/*~ makedepend cmap