diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index f3f5aa6848c8..13a863489fc1 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/12/05 23:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/12/06 08:03:00 leot Exp $
 
 DISTNAME=	zbar-0.23
 CATEGORIES=	graphics
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+=	zbar-gtk.pc.in
 PKGCONFIG_OVERRIDE+=	zbar-qt.pc.in
 PKGCONFIG_OVERRIDE+=	zbar.pc.in
 
-#.include "options.mk"
+.include "options.mk"
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/zbar/options.mk b/graphics/zbar/options.mk
new file mode 100644
index 000000000000..2e3adaf7d562
--- /dev/null
+++ b/graphics/zbar/options.mk
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.1 2019/12/06 08:03:00 leot Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.zbar
+PKG_SUPPORTED_OPTIONS=	imagemagick x11
+PKG_SUGGESTED_OPTIONS=	imagemagick x11
+
+.include "../../mk/bsd.options.mk"
+
+#
+# ImageMagick support
+#
+PLIST_VARS+=	imagemagick
+.if !empty(PKG_OPTIONS:Mimagemagick)
+PLIST.imagemagick=	yes
+CONFIGURE_ARGS+=	--with-imagemagick
+.  include "../../graphics/ImageMagick/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-imagemagick
+.endif
+
+#
+# X11 support
+#
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-xshm
+CONFIGURE_ARGS+=	--with-xv
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXv/buildlink3.mk"
+.  include "../../x11/libICE/buildlink3.mk"
+.  include "../../x11/libSM/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-x=no
+CONFIGURE_ARGS+=	--without-xshm
+CONFIGURE_ARGS+=	--without-xv
+.endif