diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 772df47c5338..389b665438c4 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gifsicle
-PORTVERSION=	1.83
+PORTVERSION=	1.84
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lcdf.org/gifsicle/
 
@@ -14,17 +14,20 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	NEWS README.md
+PLIST_FILES=	bin/gifdiff bin/gifsicle \
+		man/man1/gifdiff.1.gz man/man1/gifsicle.1.gz
 
-OPTIONS_DEFINE=	X11 DOCS
-OPTIONS_DEFAULT=X11
+OPTIONS_DEFINE=		DOCS X11
+OPTIONS_DEFAULT=	X11
+OPTIONS_SUB=		yes
 
-OPTIONS_SUB=	yes
-
-X11_CONFIGURE_OFF=	--without-x --disable-gifview
-X11_USE=	XORG=x11
+X11_USE=		xorg=x11
+X11_CONFIGURE_ENABLE=	gifview
+X11_CONFIGURE_WITH=	x
+X11_PLIST_FILES=	bin/gifview man/man1/gifview.1.gz
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/gifsicle/distinfo b/graphics/gifsicle/distinfo
index e9e75e28ba28..c52c151b1342 100644
--- a/graphics/gifsicle/distinfo
+++ b/graphics/gifsicle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gifsicle-1.83.tar.gz) = bf9e94b186dec957d93db1292f4b021a5f5e4c835f412988cd063279bd450eeb
-SIZE (gifsicle-1.83.tar.gz) = 562494
+SHA256 (gifsicle-1.84.tar.gz) = 067d43e8e04fa921341738c7e87ff99feb96cc9396459080d1cd8132273db3fa
+SIZE (gifsicle-1.84.tar.gz) = 564263
diff --git a/graphics/gifsicle/pkg-descr b/graphics/gifsicle/pkg-descr
index 079fbff37fba..c1e9defb5e17 100644
--- a/graphics/gifsicle/pkg-descr
+++ b/graphics/gifsicle/pkg-descr
@@ -1,4 +1,4 @@
-gifsicle is a powerful command-line program for manipulating GIF image files.
-Extensive options let you control what exactly it does. 
+gifsicle is a powerful command-line program for manipulating GIF image
+files. Extensive options let you control what exactly it does. 
 
 WWW: http://www.lcdf.org/gifsicle/
diff --git a/graphics/gifsicle/pkg-plist b/graphics/gifsicle/pkg-plist
deleted file mode 100644
index e346765c7096..000000000000
--- a/graphics/gifsicle/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/gifdiff
-bin/gifsicle
-man/man1/gifdiff.1.gz
-man/man1/gifsicle.1.gz
-%%X11%%bin/gifview
-%%X11%%man/man1/gifview.1.gz