diff --git a/deskutils/Makefile b/deskutils/Makefile
index e8e3c3ebb560..3c00e87a94cb 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -69,6 +69,7 @@
     SUBDIR += tuxcards
     SUBDIR += wmpinboard
     SUBDIR += xcalendar
+    SUBDIR += xchm
     SUBDIR += xinvest
     SUBDIR += xmaddressbook
     SUBDIR += xmdiary
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
new file mode 100644
index 000000000000..505dd45e0a13
--- /dev/null
+++ b/deskutils/xchm/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	xchm
+# Date created:				3th October 2003
+# Whom:					Pav Lucistnik <pav@oook.cz>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xchm
+PORTVERSION=	0.8.4
+CATEGORIES=	deskutils
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	pav@oook.cz
+COMMENT=	Windows HTML Help (.chm) viewer for UNIX
+
+LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
+		chm.0:${PORTSDIR}/misc/chmlib
+
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@REZ_COMMAND@||' ${WRKSRC}/src/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/deskutils/xchm/distinfo b/deskutils/xchm/distinfo
new file mode 100644
index 000000000000..25a15200e97a
--- /dev/null
+++ b/deskutils/xchm/distinfo
@@ -0,0 +1 @@
+MD5 (xchm-0.8.4.tar.gz) = faf1ab179c2d2a29f4432fff1067d3b3
diff --git a/deskutils/xchm/pkg-descr b/deskutils/xchm/pkg-descr
new file mode 100644
index 000000000000..ad5a68d482a2
--- /dev/null
+++ b/deskutils/xchm/pkg-descr
@@ -0,0 +1,8 @@
+xCHM is a .chm viewer for UNIX. CHM is commonly used for a rich-text help
+files on Windows platform, and for publishing eBooks.
+
+xCHM can show the contents tree if one is available, print the displayed page,
+change fonts faces and size, work with bookmarks, do the usual history stunts
+(forward, back, home), and seach for text in the whole book.
+
+WWW: http://xchm.sourceforge.net/
diff --git a/deskutils/xchm/pkg-plist b/deskutils/xchm/pkg-plist
new file mode 100644
index 000000000000..c547c17eda1c
--- /dev/null
+++ b/deskutils/xchm/pkg-plist
@@ -0,0 +1 @@
+bin/xchm