diff --git a/x11/xforward/Makefile b/x11/xforward/Makefile
index 5b7819d93a75..2f18cb243c70 100644
--- a/x11/xforward/Makefile
+++ b/x11/xforward/Makefile
@@ -1,23 +1,32 @@
 # Created by: Cy Schubert <cy@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xforward
 PORTVERSION=	1.0
 CATEGORIES=	x11
 MASTER_SITES=	http://komquats.com/distfiles/ \
 		http://people.freebsd.org/~cy/distfiles/
 DISTNAME=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Provide user-level X forwarding service
 
 LICENSE_FILE=	${WRKSRC}/NOTICE
 
 MAKE_ARGS+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
-USE_XORG=	x11 xt xaw
+USE_XORG=	x11 xt xaw xmu xt xext sm ice xp xft xau xcb xdmcp xrender
 USES=		motif
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libexpat.so:textproc/expat2 \
+		libfreetype.so:print/freetype2
 PLIST_FILES=	bin/xforward man/man1/xforward.1.gz
 
+OPTIONS_DEFINE=		STATIC
+STATIC_ALL_TARGET=	all-static
+STATIC_INSTALL_TARGET=	install-static
+STATIC_PLIST_FILES=	bin/xforward-static
+
 .include <bsd.port.mk>
diff --git a/x11/xforward/files/patch-Makefile b/x11/xforward/files/patch-Makefile
index 2c05be07154a..1e35b4c243b9 100644
--- a/x11/xforward/files/patch-Makefile
+++ b/x11/xforward/files/patch-Makefile
@@ -1,25 +1,59 @@
 --- Makefile.orig	1993-06-04 19:32:01.000000000 -0700
-+++ Makefile	2012-04-27 13:01:33.079482669 -0700
-@@ -18,17 +18,17 @@
++++ Makefile	2016-04-29 22:53:07.305978000 -0700
+@@ -18,17 +18,19 @@
  # MANDIR is where the manual page will be installed.
  
  DESTDIR=
 -BINDIR=/usr/local/bin
 -MANDIR=/usr/local/man/man1
 +BINDIR=${PREFIX}/bin
 +MANDIR=${PREFIX}/man/man1
  
  # Where to find things
  # INCFLAGS lists directories to search for header files
  # LDFLAGS lists directories to search for libraries
  # LIBS lists the necessary libraries (Motif, Xt, X11)
  
 -INCFLAGS= -I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt
 -LDFLAGS= -L/usr/lib/DXM/lib/Xm -L/usr/lib/DXM/lib/Xt
 -LIBS= -lXm -lXt -lX11
 +INCFLAGS= -I${LOCALBASE}/include
 +LDFLAGS= -L${LOCALBASE}/lib
 +LIBS= -lXm -lXt -lX11 -lXext
++LIBS_STATIC= -lXm -lXmu -lXt -lXext -lSM -lICE -lpng16 -lz -lm -ljpeg -lXp -lXft -lfontconfig -lexpat -lfreetype -lbz2 -lX11 -lXau -lxcb -lXdmcp -lXau -lXft -lXrender
++
  
  CFLAGS= ${INCFLAGS} -O
  
+@@ -39,20 +41,30 @@
+ AUXFILES= README NOTICE Makefile xforward.1
+ 
+ PROGS = xforward
++PROGS_STATIC = xforward-static
+ 
++all-static: all ${PROGS_STATIC}
++
+ all: ${PROGS}
+ 
+ xforward:	xforward.o
+ 	cc ${LDFLAGS} xforward.o -o xforward ${LIBS}
+ 
++xforward-static:	xforward.o
++	cc ${LDFLAGS} -static xforward.o -o xforward-static ${LIBS_STATIC}
++
+ xforward.o:	xforward.c
+ 	cc -c ${CFLAGS} xforward.c
+ 
+ install: ${PROGS}
+ 	install -c xforward ${DESTDIR}${BINDIR}/xforward
+ 	install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
++
++install-static: install ${PROGS_STATIC}
++	install -c xforward-static ${DESTDIR}${BINDIR}/xforward-static
++
+ clean: 	;
+-	rm -f *~ *.o core ${PROGS}
++	rm -f *~ *.o core ${PROGS} ${PROGS_STATIC}
+ 
+ center:
+ 	#load ${LDFLAGS} ${LIBS}