diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 261368cb6f59..c776805f8b56 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2017/11/30 16:45:26 adam Exp $
+# $NetBSD: Makefile,v 1.66 2018/01/10 09:38:32 wiz Exp $
 
-DISTNAME=	geeqie-1.3
-EXTRACT_SUFX=	.tar.xz
-PKGREVISION=	7
+DISTNAME=	geeqie-1.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.geeqie.org/
@@ -22,6 +21,7 @@ USE_TOOLS=		bash:run gmake intltool msgfmt pkg-config automake autoconf autoreco
 REPLACE_BASH=		plugins/rotate/geeqie-rotate
 REPLACE_BASH+=		plugins/ufraw/geeqie-ufraw
 REPLACE_BASH+=		plugins/import/geeqie-import
+REPLACE_BASH+=		gen_changelog.sh
 
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST
index fd95dab4126d..2a2df069cd8f 100644
--- a/graphics/geeqie/PLIST
+++ b/graphics/geeqie/PLIST
@@ -1,31 +1,32 @@
-@comment $NetBSD: PLIST,v 1.6 2016/05/29 20:40:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/10 09:38:32 wiz Exp $
 bin/geeqie
 lib/geeqie/geeqie-import
 lib/geeqie/geeqie-rotate
 lib/geeqie/geeqie-symlink
 lib/geeqie/geeqie-ufraw
+lib/geeqie/geocode-parameters.awk
 man/man1/geeqie.1
 share/applications/geeqie.desktop
+share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/README
 share/doc/${PKGNAME}/README.lirc
+share/doc/${PKGNAME}/README.md
 share/doc/${PKGNAME}/TODO
-share/doc/${PKGNAME}/html/AdvancedFeatures.html
-share/doc/${PKGNAME}/html/Authors.html
-share/doc/${PKGNAME}/html/BasicFeatures.html
 share/doc/${PKGNAME}/html/Cancelbutton.html
 share/doc/${PKGNAME}/html/Commandline.html
-share/doc/${PKGNAME}/html/Copyright.html
+share/doc/${PKGNAME}/html/ExifRotation.html
+share/doc/${PKGNAME}/html/Features.html
 share/doc/${PKGNAME}/html/GuideCollections.html
+share/doc/${PKGNAME}/html/GuideColorManagement.html
 share/doc/${PKGNAME}/html/GuideCredits.html
 share/doc/${PKGNAME}/html/GuideFaq.html
 share/doc/${PKGNAME}/html/GuideGnuFdl.html
 share/doc/${PKGNAME}/html/GuideImageManagement.html
 share/doc/${PKGNAME}/html/GuideImageManagementCopyMove.html
 share/doc/${PKGNAME}/html/GuideImageManagementDelete.html
-share/doc/${PKGNAME}/html/GuideImageManagementExternalEditing.html
+share/doc/${PKGNAME}/html/GuideImageManagementPlugins.html
 share/doc/${PKGNAME}/html/GuideImageManagementRename.html
+share/doc/${PKGNAME}/html/GuideImageMarks.html
 share/doc/${PKGNAME}/html/GuideImagePresentation.html
 share/doc/${PKGNAME}/html/GuideImagePresentationFullscreen.html
 share/doc/${PKGNAME}/html/GuideImagePresentationSlideshow.html
@@ -35,6 +36,7 @@ share/doc/${PKGNAME}/html/GuideImageSearchSearch.html
 share/doc/${PKGNAME}/html/GuideIndex-info.html
 share/doc/${PKGNAME}/html/GuideIndex.html
 share/doc/${PKGNAME}/html/GuideIntroduction.html
+share/doc/${PKGNAME}/html/GuideLicence.html
 share/doc/${PKGNAME}/html/GuideMainWindow.html
 share/doc/${PKGNAME}/html/GuideMainWindowFilePane.html
 share/doc/${PKGNAME}/html/GuideMainWindowFolderPane.html
@@ -43,7 +45,7 @@ share/doc/${PKGNAME}/html/GuideMainWindowLayout.html
 share/doc/${PKGNAME}/html/GuideMainWindowMenus.html
 share/doc/${PKGNAME}/html/GuideMainWindowNavigation.html
 share/doc/${PKGNAME}/html/GuideMainWindowStatusBar.html
-share/doc/${PKGNAME}/html/GuideOptions.html
+share/doc/${PKGNAME}/html/GuideOptionsAdditional.html
 share/doc/${PKGNAME}/html/GuideOptionsBehavior.html
 share/doc/${PKGNAME}/html/GuideOptionsColor.html
 share/doc/${PKGNAME}/html/GuideOptionsFiltering.html
@@ -52,27 +54,36 @@ share/doc/${PKGNAME}/html/GuideOptionsHidden.html
 share/doc/${PKGNAME}/html/GuideOptionsImage.html
 share/doc/${PKGNAME}/html/GuideOptionsKeyboard.html
 share/doc/${PKGNAME}/html/GuideOptionsLayout.html
+share/doc/${PKGNAME}/html/GuideOptionsMain.html
 share/doc/${PKGNAME}/html/GuideOptionsMetadata.html
+share/doc/${PKGNAME}/html/GuideOptionsStereo.html
+share/doc/${PKGNAME}/html/GuideOptionsToolbar.html
 share/doc/${PKGNAME}/html/GuideOptionsWindow.html
 share/doc/${PKGNAME}/html/GuideOtherWindows.html
-share/doc/${PKGNAME}/html/GuideOtherWindowsImageProperties.html
+share/doc/${PKGNAME}/html/GuideOtherWindowsExif.html
 share/doc/${PKGNAME}/html/GuideOtherWindowsImageWindow.html
 share/doc/${PKGNAME}/html/GuideOtherWindowsPanView.html
+share/doc/${PKGNAME}/html/GuidePluginsConfig.html
 share/doc/${PKGNAME}/html/GuidePrinting.html
 share/doc/${PKGNAME}/html/GuideReference.html
 share/doc/${PKGNAME}/html/GuideReferenceCommandLine.html
+share/doc/${PKGNAME}/html/GuideReferenceConfig.html
+share/doc/${PKGNAME}/html/GuideReferenceDecodeLatLong.html
 share/doc/${PKGNAME}/html/GuideReferenceKeyboardShortcuts.html
+share/doc/${PKGNAME}/html/GuideReferenceLIRC.html
 share/doc/${PKGNAME}/html/GuideReferenceLua.html
 share/doc/${PKGNAME}/html/GuideReferenceManagement.html
+share/doc/${PKGNAME}/html/GuideReferenceMetadata.html
+share/doc/${PKGNAME}/html/GuideReferencePixbufLoaders.html
+share/doc/${PKGNAME}/html/GuideReferenceStandards.html
+share/doc/${PKGNAME}/html/GuideReferenceSupportedFormats.html
 share/doc/${PKGNAME}/html/GuideReferenceThumbnails.html
-share/doc/${PKGNAME}/html/GuideReferenceToolbar.html
+share/doc/${PKGNAME}/html/GuideReferenceXmpExif.html
 share/doc/${PKGNAME}/html/GuideSidebars.html
 share/doc/${PKGNAME}/html/GuideSidebarsInfo.html
 share/doc/${PKGNAME}/html/GuideSidebarsSortManager.html
 share/doc/${PKGNAME}/html/Imageviewing.html
 share/doc/${PKGNAME}/html/Layouttab.html
-share/doc/${PKGNAME}/html/LegalNotice.html
-share/doc/${PKGNAME}/html/License.html
 share/doc/${PKGNAME}/html/Miscellaneous.html
 share/doc/${PKGNAME}/html/Papertab.html
 share/doc/${PKGNAME}/html/Preview.html
@@ -80,8 +91,37 @@ share/doc/${PKGNAME}/html/Printbutton.html
 share/doc/${PKGNAME}/html/Printertab.html
 share/doc/${PKGNAME}/html/Rememberprintsettings.html
 share/doc/${PKGNAME}/html/Texttab.html
-share/doc/${PKGNAME}/html/Thecollectionwindow.html
+share/doc/${PKGNAME}/html/dialog-ok-apply.png
+share/doc/${PKGNAME}/html/document-new.png
+share/doc/${PKGNAME}/html/document-print.png
+share/doc/${PKGNAME}/html/document-save.png
+share/doc/${PKGNAME}/html/edit-delete.png
+share/doc/${PKGNAME}/html/edit-find.png
+share/doc/${PKGNAME}/html/go-down.png
+share/doc/${PKGNAME}/html/go-previous.png
+share/doc/${PKGNAME}/html/go-up.png
+share/doc/${PKGNAME}/html/gtk-color-picker.png
+share/doc/${PKGNAME}/html/gtk-edit.png
+share/doc/${PKGNAME}/html/gtk-select-color.png
+share/doc/${PKGNAME}/html/help-contents.png
+share/doc/${PKGNAME}/html/icon_float.png
+share/doc/${PKGNAME}/html/icon_thumb.png
 share/doc/${PKGNAME}/html/index.html
+share/doc/${PKGNAME}/html/list-add.png
+share/doc/${PKGNAME}/html/list-remove.png
+share/doc/${PKGNAME}/html/media-playback-pause.png
+share/doc/${PKGNAME}/html/preferences-desktop-font.png
+share/doc/${PKGNAME}/html/preferences-desktop.png
+share/doc/${PKGNAME}/html/process-stop.png
+share/doc/${PKGNAME}/html/stock_convert_24.png
+share/doc/${PKGNAME}/html/user-home.png
+share/doc/${PKGNAME}/html/view-fullscreen.png
+share/doc/${PKGNAME}/html/view-refresh.png
+share/doc/${PKGNAME}/html/window-close.png
+share/doc/${PKGNAME}/html/zoom-fit-best.png
+share/doc/${PKGNAME}/html/zoom-in.png
+share/doc/${PKGNAME}/html/zoom-original.png
+share/doc/${PKGNAME}/html/zoom-out.png
 share/geeqie/applications/geeqie-import-geeqie.desktop
 share/geeqie/applications/geeqie-import-gqview.desktop
 share/geeqie/applications/geeqie-ufraw-id.desktop
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index d3aa54f7553a..4ae8d8684f0c 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.11 2016/05/29 20:40:16 wiz Exp $
+$NetBSD: distinfo,v 1.12 2018/01/10 09:38:32 wiz Exp $
 
-SHA1 (geeqie-1.3.tar.xz) = f991b44d8587f2f42d5793700c5f6882bed6abf9
-RMD160 (geeqie-1.3.tar.xz) = fd730c5ce969b53e3b5d250f58308ea9b58fd936
-SHA512 (geeqie-1.3.tar.xz) = b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
-Size (geeqie-1.3.tar.xz) = 1141820 bytes
+SHA1 (geeqie-1.4.tar.xz) = bef0e6c6a0aba8b957375087bcb570cb9dac64b1
+RMD160 (geeqie-1.4.tar.xz) = 1e3ffccba08edc2739051f1252ca653f008de35b
+SHA512 (geeqie-1.4.tar.xz) = a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
+Size (geeqie-1.4.tar.xz) = 35881152 bytes
+SHA1 (patch-Makefile.am) = 49aba28dcb6a3671550ddab5c80d93f3a094d47f
 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
-SHA1 (patch-configure.in) = 4d1ca9003938669651f98cc43a6d525979b737da
-SHA1 (patch-doc_Makefile.am) = 0efedf8892e4a1bc342e6f6ebc757151c33920b2
+SHA1 (patch-configure.in) = d606bab2b701a48af92fc90404740d9a16492e44
+SHA1 (patch-doc_Makefile.am) = 9ffbcd6f8e5bc5710b61dfbfb020e92497d3414f
+SHA1 (patch-src_layout__util.c) = cb5d82d7c02690fcad6ef8139788100928d03ac1
diff --git a/graphics/geeqie/patches/patch-Makefile.am b/graphics/geeqie/patches/patch-Makefile.am
new file mode 100644
index 000000000000..e54dc0239bde
--- /dev/null
+++ b/graphics/geeqie/patches/patch-Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile.am,v 1.1 2018/01/10 09:38:32 wiz Exp $
+
+ChangeLog files are not in distfile.
+
+--- Makefile.am.orig	2017-12-31 12:31:21.000000000 +0000
++++ Makefile.am
+@@ -10,9 +10,9 @@ man_MANS = geeqie.1
+ readmedir = @readmedir@
+ 
+ if HAVE_MARKDOWN
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS
+ endif
+ 
+ desktopdir = $(datadir)/applications
diff --git a/graphics/geeqie/patches/patch-configure.in b/graphics/geeqie/patches/patch-configure.in
index 3304d3df74fb..c1e02cbe262f 100644
--- a/graphics/geeqie/patches/patch-configure.in
+++ b/graphics/geeqie/patches/patch-configure.in
@@ -1,20 +1,17 @@
-$NetBSD: patch-configure.in,v 1.1 2016/04/17 09:45:59 wiz Exp $
+$NetBSD: patch-configure.in,v 1.2 2018/01/10 09:38:32 wiz Exp $
 
 Fix unportable test(1) operator.
 
---- configure.in.orig	2016-03-07 10:21:06.000000000 +0000
+--- configure.in.orig	2017-12-31 12:31:21.000000000 +0000
 +++ configure.in
-@@ -192,7 +192,7 @@ fi
+@@ -200,12 +200,12 @@ fi
  AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
- AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
+ AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])])
  
 -if test x$gtk3 == xyes; then
 +if test x$gtk3 = xyes; then
      AC_MSG_WARN("Gtk3 enabled")
      m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
- else
-@@ -202,7 +202,7 @@ else
-     fi
  fi
  
 -if test x$gtk3 == xno; then
diff --git a/graphics/geeqie/patches/patch-doc_Makefile.am b/graphics/geeqie/patches/patch-doc_Makefile.am
index eb16eb171de6..6d1cb7b1981e 100644
--- a/graphics/geeqie/patches/patch-doc_Makefile.am
+++ b/graphics/geeqie/patches/patch-doc_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_Makefile.am,v 1.1 2016/04/17 09:45:59 wiz Exp $
+$NetBSD: patch-doc_Makefile.am,v 1.2 2018/01/10 09:38:32 wiz Exp $
 
 Generate html docs in build phase (instead of install phase).
 gnome-doc-tool seems to ignore "-o html" so manually generate
@@ -8,11 +8,11 @@ Solves PLIST problem due to missing html files.
 
 This is not know to be reported upstream.
 
---- doc/Makefile.am.orig	2016-03-07 10:21:06.000000000 +0000
+--- doc/Makefile.am.orig	2017-12-31 12:31:21.000000000 +0000
 +++ doc/Makefile.am
 @@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook
  html/GuideIndex.html: docbook/GuideIndex.xml
- 	rm -rf html; mkdir html
+ 	rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
  	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
 -		"$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
 +		cd html && "$(GNOME_DOC_TOOL)" html $(srcdir)/../docbook/GuideIndex.xml ; \
diff --git a/graphics/geeqie/patches/patch-src_layout__util.c b/graphics/geeqie/patches/patch-src_layout__util.c
new file mode 100644
index 000000000000..086a6ca71fb1
--- /dev/null
+++ b/graphics/geeqie/patches/patch-src_layout__util.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_layout__util.c,v 1.1 2018/01/10 09:38:32 wiz Exp $
+
+1. For WEXITSTATUS().
+2. Fix
+layout_util.c: In function 'layout_menu_write_rotate':
+layout_util.c:516:16: error: lvalue required as unary '&' operand
+
+--- src/layout_util.c.orig	2017-12-31 12:31:21.000000000 +0000
++++ src/layout_util.c
+@@ -58,6 +58,7 @@
+ #include "metadata.h"
+ #include "desktop_file.h"
+ 
++#include <sys/wait.h>
+ #include <gdk/gdkkeysyms.h> /* for keyboard values */
+ #include "keymap_template.c"
+ 
+@@ -495,6 +496,7 @@ static void layout_menu_write_rotate(Gtk
+ 
+ 	while (work)
+ 		{
++		int ret;
+ 		if (lw->vf->type == FILEVIEW_ICON)
+ 			{
+ 			fd_n = work->data;
+@@ -512,7 +514,8 @@ static void layout_menu_write_rotate(Gtk
+ 		command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
+ 													keep_date ? " -t " : " ", fd_n->path, NULL);
+ 
+-		run_result = WEXITSTATUS(runcmd(command));
++		ret = runcmd(command);
++		run_result = WEXITSTATUS(ret);
+ 		if (!run_result)
+ 			{
+ 			fd_n->user_orientation = 0;