--- b/graphics/ufraw/Makefile	
+++ b/graphics/ufraw/Makefile	
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-extras
+CONFIGURE_ARGS=	--enable-extras --enable-jasper
 USES=		compiler:c++11-lang desktop-file-utils gettext gmake jpeg pkgconfig autoreconf gnome
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -42,14 +42,14 @@ USE_GNOME+=glib20 gtk20 cairo gdkpixbuf2
 CONTRAST_CONFIGURE_ENABLE=	contrast
 DST_CONFIGURE_ENABLE=	dst-correction
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
-EXIV2_VARS_OFF=		PC_FALSE+=exiv2
 LENSFUN_LIB_DEPENDS=	liblensfun.so:graphics/lensfun
-LENSFUN_VARS_OFF=	PC_FALSE+=lensfun
+FITS_CONFIGURE_WITH=	cfitsio
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
-FITS_VARS_OFF=		PC_FALSE+=cfitsio
-GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
+GIMP_LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
+			libgegl-0.4.so:graphics/gegl \
+			libgimp-2.0.so:graphics/gimp-app \
+			libjson-glib-1.0.so:devel/json-glib
 GIMP_CONFIGURE_WITH=	gimp
-GIMP_VARS_OFF=		PC_FALSE+=gimp
 GIMP_IMPLIES=		GTK2
 GTK2_LIB_DEPENDS=	libgtkimageview.so:x11-toolkits/gtkimageview
 GTK2_CONFIGURE_WITH=	gtk
@@ -59,6 +59,17 @@ GNOME_VARS=		CATEGORIES+=gnome GCONF_SCHEMAS=${PORTNAME}.schemas
 
 post-patch:
 	${GREP} -Ilrs 'default(none)' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's/default(none)//g'
+	@${REINPLACE_CMD} -e 's|$$(datadir)/gconf/schemas|${PREFIX}/etc/gconf/schemas|g' \
+		${WRKSRC}/Makefile.am
+
+post-patch-EXIV2-off:
+	@${REINPLACE_CMD} -e 's|exiv2 >= 0.20|exiv2 < 0|g' \
+		${WRKSRC}/configure.ac
+
+post-patch-LENSFUN-off:
+	@${REINPLACE_CMD} -e 's|lensfun >= 0.2.5|lensfun < 0|g' \
+		${WRKSRC}/configure.ac
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ufraw.desktop ${STAGEDIR}${DESKTOPDIR}
 
--- b/graphics/ufraw/pkg-plist	
+++ b/graphics/ufraw/pkg-plist	
@@ -4,6 +4,7 @@ bin/nikon-curve
 bin/ufraw-batch
 %%GIMP%%libexec/gimp/2.2/plug-ins/ufraw-gimp
 man/man1/ufraw.1.gz
+%%GNOME%%share/appdata/ufraw.appdata.xml
 share/applications/ufraw.desktop
 share/locale/ca/LC_MESSAGES/ufraw.mo
 share/locale/cs/LC_MESSAGES/ufraw.mo