diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 150f060ac430b..91abbabf854f8 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,33 +1,27 @@
-# $NetBSD: Makefile,v 1.65 2014/05/29 23:36:37 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2014/09/27 10:52:38 szptvlfn Exp $
 
-DISTNAME=	feh-2.9.3
-PKGREVISION=	2
+DISTNAME=	feh-2.12
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://feh.finalrewind.org/
-COMMENT=	Advanced image viewer
+COMMENT=	Imlib2 based image viewer
 LICENSE=	mit
 
 #GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--program-transform-name=s,cam,feh_cam,
+#CONFIGURE_ARGS+=	--program-transform-name=s,cam,feh_cam,
 
-USE_TOOLS+=	bash:run perl:run gmake
-
-REPLACE_BASH=		cam/gen-cam-menu
-REPLACE_PERL=		scripts/*.pl cam/feh-cam
+USE_TOOLS+=	gmake
 
 LDFLAGS.SunOS+=		-lnsl -lsocket
 
-BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.4
-
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../devel/giblib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/graphics/feh/PLIST b/graphics/feh/PLIST
index 735c21a5f4317..9e026027d3728 100644
--- a/graphics/feh/PLIST
+++ b/graphics/feh/PLIST
@@ -1,16 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2013/07/24 11:01:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/09/27 10:52:38 szptvlfn Exp $
 bin/feh
-bin/feh-cam
-bin/gen-cam-menu
-man/man1/feh-cam.1
 man/man1/feh.1
-man/man1/gen-cam-menu.1
 share/applications/feh.desktop
 share/doc/feh/AUTHORS
 share/doc/feh/ChangeLog
 share/doc/feh/README
 share/doc/feh/TODO
 share/doc/feh/examples/buttons
+share/doc/feh/examples/find-lowres
 share/doc/feh/examples/keys
 share/doc/feh/examples/themes
 share/feh/fonts/black.style
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 54ba7c2edda99..eb6b8cecd761c 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2013/07/24 11:01:59 drochner Exp $
+$NetBSD: distinfo,v 1.29 2014/09/27 10:52:38 szptvlfn Exp $
 
-SHA1 (feh-2.9.3.tar.bz2) = 6e93c9bbc339d36002ead189d0a94880f58876bd
-RMD160 (feh-2.9.3.tar.bz2) = 702c973a5e16b62dc38278b5c6e4d55cd3f06965
-Size (feh-2.9.3.tar.bz2) = 2082188 bytes
+SHA1 (feh-2.12.tar.bz2) = 30eb2b778858b1f4ce97e44c8225758185b0c588
+RMD160 (feh-2.12.tar.bz2) = 515073a9ead457c89137689af08e35f54c45a5eb
+Size (feh-2.12.tar.bz2) = 2090538 bytes
 SHA1 (patch-config.mk) = 7f99ff19820a62c8a7a9d3b0fb9c7f1a8151f6c5
 SHA1 (patch-src_getopt.c) = 337fd15564c1d5b5596fe7d0d2f9bd6b0ca44ca7
 SHA1 (patch-src_imlib_c) = 925d2536b69f99acc949cb6bd67422d001335492