diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 9db51d08cc57..564e6524b180 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -1,82 +1,83 @@
 # $FreeBSD$
 #
 
     COMMENT = X11 fonts and font utilities
 
     SUBDIR += XFree86-4-font100dpi
     SUBDIR += XFree86-4-font75dpi
     SUBDIR += XFree86-4-fontCyrillic
     SUBDIR += XFree86-4-fontDefaultBitmaps
     SUBDIR += XFree86-4-fontEncodings
     SUBDIR += XFree86-4-fontScalable
     SUBDIR += Xg
     SUBDIR += arkpandora
     SUBDIR += artwiz-aleczapka
     SUBDIR += artwiz-aleczapka-de
     SUBDIR += artwiz-aleczapka-se
     SUBDIR += artwiz-fonts
     SUBDIR += avifonts
     SUBDIR += bdfresize
     SUBDIR += bitmap-fonts
     SUBDIR += bitstream-vera
     SUBDIR += code2000
     SUBDIR += cyberbit-ttfonts
     SUBDIR += cyr-rfx
     SUBDIR += dejavu
     SUBDIR += etlfonts
     SUBDIR += farsifonts
+    SUBDIR += fntsample
     SUBDIR += fontconfig
     SUBDIR += fontconfig-reference
     SUBDIR += freefont-ttf
     SUBDIR += freefonts
     SUBDIR += geminifonts
     SUBDIR += gentium
     SUBDIR += getbdf
     SUBDIR += gfe
     SUBDIR += gnome-font-sampler
     SUBDIR += intlfonts
     SUBDIR += jmk-x11-fonts
     SUBDIR += junicode
     SUBDIR += lfpfonts-fix
     SUBDIR += lfpfonts-var
     SUBDIR += libXft
     SUBDIR += linux-fontconfig
     SUBDIR += manu-gothica
     SUBDIR += mathfonts
     SUBDIR += mgopen
     SUBDIR += mkbold
     SUBDIR += mkbold-mkitalic
     SUBDIR += mkitalic
     SUBDIR += mozilla-fonts
     SUBDIR += nexfontsel
     SUBDIR += nucleus
     SUBDIR += p5-Font-AFM
     SUBDIR += p5-Font-TTF
     SUBDIR += p5-type1inst
     SUBDIR += pcf2bdf
     SUBDIR += ppantsfonts
     SUBDIR += proggy_fonts
     SUBDIR += sgifonts
     SUBDIR += sharefonts
     SUBDIR += suxus
     SUBDIR += terminus-font
     SUBDIR += texcm-ttf
     SUBDIR += tkfont
     SUBDIR += tolkien-ttf
     SUBDIR += ttmkfdir
     SUBDIR += tv-fonts
     SUBDIR += urwfonts
     SUBDIR += urwfonts-ttf
     SUBDIR += webfonts
     SUBDIR += wqy
     SUBDIR += xfed
     SUBDIR += xmbdfed
     SUBDIR += xorg-fonts-100dpi
     SUBDIR += xorg-fonts-75dpi
     SUBDIR += xorg-fonts-cyrillic
     SUBDIR += xorg-fonts-encodings
     SUBDIR += xorg-fonts-miscbitmaps
     SUBDIR += xorg-fonts-truetype
     SUBDIR += xorg-fonts-type1
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
new file mode 100644
index 000000000000..70348fe621a4
--- /dev/null
+++ b/x11-fonts/fntsample/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for:	fntsample
+# Date created:		22 January 2007
+# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fntsample
+PORTVERSION=	2.1
+CATEGORIES=	x11-fonts
+MASTER_SITES=	SF http://unicode.org/Public/5.0.0/ucd/:unidata
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Blocks.txt:unidata
+EXTRACT_ONLY=	${DISTFILES:M*gz}
+
+MAINTAINER=	infofarmer@FreeBSD.org
+COMMENT=	Show Unicode coverage of a font
+
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
+		freetype.9:${PORTSDIR}/print/freetype2
+
+USE_GNOME=	glib20 pkgconfig
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
+PLIST_FILES=	bin/${PORTNAME}
+MAN1=		${PORTNAME}.1
+
+post-extract:
+	@${CP} ${_DISTDIR}/Blocks.txt ${WRKSRC}/
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/share/unicode|${WRKSRC}|' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/fntsample/distinfo b/x11-fonts/fntsample/distinfo
new file mode 100644
index 000000000000..47dfb3d78eec
--- /dev/null
+++ b/x11-fonts/fntsample/distinfo
@@ -0,0 +1,6 @@
+MD5 (fntsample-2.1.tar.gz) = 137311165ebb5d92a4d3e9fab1f1b9f0
+SHA256 (fntsample-2.1.tar.gz) = 1e924fd613b108eb8432563fe527fb88572947f3b703f4565425686332b22da9
+SIZE (fntsample-2.1.tar.gz) = 81612
+MD5 (Blocks.txt) = 2555f416d6b064be4a532d3748268569
+SHA256 (Blocks.txt) = 4116c568ac01b49f1c27bf9ef3b4e9e9d9b10452997732e165a7bfd78862f16f
+SIZE (Blocks.txt) = 5455
diff --git a/x11-fonts/fntsample/files/patch-fntsample.c b/x11-fonts/fntsample/files/patch-fntsample.c
new file mode 100644
index 000000000000..9e0a350e4500
--- /dev/null
+++ b/x11-fonts/fntsample/files/patch-fntsample.c
@@ -0,0 +1,10 @@
+--- ./fntsample.c.orig	Mon Jan 22 18:21:53 2007
++++ ./fntsample.c	Mon Jan 22 18:22:03 2007
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <glib.h>
+ #include <stdbool.h>
++#include <getopt.h>
+ 
+ #include "unicode_blocks.h"
+ 
diff --git a/x11-fonts/fntsample/pkg-descr b/x11-fonts/fntsample/pkg-descr
new file mode 100644
index 000000000000..81e5355a18c9
--- /dev/null
+++ b/x11-fonts/fntsample/pkg-descr
@@ -0,0 +1,6 @@
+A program for making font samples that show Unicode coverage of the
+font and are similar in appearance to Unicode charts. Samples can be
+saved as PDF or PostScript files.
+
+WWW: http://sourceforge.net/projects/fntsample/
+Author: Eugeniy Meshcheryakov <eugeniy@users.sourceforge.net>