diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index cbacbcf5dfbe..8c9eb2d005ae 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -2,10 +2,13 @@
 
 PORTNAME=	xterm
 PORTVERSION=	284
+PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://invisible-island.net/xterm/ \
-		CRITICAL
+MASTER_SITES=	ftp://invisible-island.net/xterm/:src1 \
+		CRITICAL:src1 CRITICAL:src2
 EXTRACT_SUFX=	.tgz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src1 \
+		bsd-xterm-icons-${ICONVERSION}${EXTRACT_SUFX}:src2
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Terminal emulator for the X Window System
@@ -17,21 +20,28 @@ WANT_GNOME=	desktopfileutils
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--with-utempter --enable-narrowproto --enable-256-color
+CONFIGURE_ARGS+=	--with-utempter --enable-narrowproto
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE GNOME DABBREV
+ICONVERSION=	1
+
+OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE GNOME DABBREV 256COLOR
 
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
 LUIT_DESC=	Use LUIT for locale convertion from/to UTF-8
 WCHAR_DESC=	Enable wide-character support
+256COLOR_DESC=	Enable 256-color support
 
-OPTIONS_DEFAULT=WCHAR LUIT
+OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:M256COLOR}
+CONFIGURE_ARGS+=	--enable-256-color
+.endif
+
 .if ${PORT_OPTIONS:MLUIT}
 CONFIGURE_ARGS+=	--enable-luit
 BUILD_DEPENDS=	luit:${PORTSDIR}/x11/luit
@@ -69,6 +79,10 @@ MAN1=		resize.1 koi8rxterm.1 uxterm.1 xterm.1
 LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
 .endif
 
+post-extract:
+	@${CP} ${WRKDIR}/bsd-xterm-icons-1/*.png ${WRKDIR}/bsd-xterm-icons-1/*.xpm \
+		${WRKSRC}/icons/
+
 post-install:
 .for f in koi8rxterm resize uxterm xterm
 	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${f}
diff --git a/x11/xterm/distinfo b/x11/xterm/distinfo
index 30c0dd95cfe8..cbdfcdb41fa8 100644
--- a/x11/xterm/distinfo
+++ b/x11/xterm/distinfo
@@ -1,2 +1,4 @@
 SHA256 (xterm-284.tgz) = a5c400c753bc9d6c219753a210e516de388dd1e8771f44a91c0094d4901365af
 SIZE (xterm-284.tgz) = 1098456
+SHA256 (bsd-xterm-icons-1.tgz) = fcf51dce0e23e9911a16ed7f2ce835bb6ff2ada65f023c29fdd8abda2795bf7c
+SIZE (bsd-xterm-icons-1.tgz) = 22718