diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index 823fd4ea0a2..78f6bded582 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2012/03/29 13:38:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2012/05/10 12:38:00 okan Exp $
 
 COMMENT=	creating & editing GIF images and animations
 
 DISTNAME=	gifsicle-1.60
+REVISION=	0
 CATEGORIES=    	graphics
 
 MAINTAINER=	Eric Faurot <eric@openbsd.org>
@@ -12,7 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+WANTLIB=		c ICE SM X11
 
 HOMEPAGE=	http://www.lcdf.org/gifsicle/
 
@@ -20,19 +21,10 @@ MASTER_SITES=	${HOMEPAGE}/ \
 		ftp://ftp.lcdf.org/pub/ \
 		ftp://ftp.lcdf.org/pub/OLD-VERSIONS/
 
-FLAVORS=	no_x11
-FLAVOR?=
-
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-gifdiff
 
 SEPARATE_BUILD=		Yes
 USE_GROFF =	Yes
 
-.if ${FLAVOR:Mno_x11}
-CONFIGURE_ARGS+=	--disable-gifview
-.else
-WANTLIB+=	ICE SM X11
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/gifsicle/pkg/DESCR b/graphics/gifsicle/pkg/DESCR
index 37781c61a02..5b7933748ca 100644
--- a/graphics/gifsicle/pkg/DESCR
+++ b/graphics/gifsicle/pkg/DESCR
@@ -1,6 +1,3 @@
 Gifsicle twaddles GIF image files in a variety of ways. It is better
 than many of the freely available GIF twaddlers on the market - for one
 thing, it has more options.
-
-Flavors:
-	no_x11 - Build without X support (excludes gifview).
diff --git a/graphics/gifsicle/pkg/PFRAG.no-no_x11 b/graphics/gifsicle/pkg/PFRAG.no-no_x11
deleted file mode 100644
index 497b59a1d0b..00000000000
--- a/graphics/gifsicle/pkg/PFRAG.no-no_x11
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2008/06/08 21:26:48 eric Exp $
-@bin bin/gifview
-@man man/man1/gifview.1
diff --git a/graphics/gifsicle/pkg/PLIST b/graphics/gifsicle/pkg/PLIST
index 910682d5cde..0162ca48312 100644
--- a/graphics/gifsicle/pkg/PLIST
+++ b/graphics/gifsicle/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2008/06/08 21:26:48 eric Exp $
+@comment $OpenBSD: PLIST,v 1.7 2012/05/10 12:38:00 okan Exp $
+@pkgpath graphics/gifsicle,no_x11
 @bin bin/gifdiff
 @bin bin/gifsicle
+@bin bin/gifview
 @man man/man1/gifdiff.1
 @man man/man1/gifsicle.1
-!%%no_x11%%
+@man man/man1/gifview.1