diff --git a/.gitignore b/.gitignore
index c373503..6f7bae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ geeqie-1.0.tar.gz
 /geeqie-1.2.2.tar.xz
 /geeqie-1.3.tar.xz
 /geeqie-1.4.tar.xz
+/geeqie-g0004617.tar.bz2
diff --git a/geeqie-1.4-Wno-unused-but-set-variable.patch b/geeqie-1.4-Wno-unused-but-set-variable.patch
deleted file mode 100644
index 4b47c7a..0000000
--- a/geeqie-1.4-Wno-unused-but-set-variable.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- geeqie-1.4.orig/configure.in	2017-12-31 07:31:21.000000000 -0500
-+++ geeqie-1.4/configure.in	2018-01-01 14:26:40.782261872 -0500
-@@ -18,7 +18,7 @@
- AC_INIT([geeqie], 1.4, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
- 
- # Add -Werror to the default CFLAGS
--CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
-+CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type -Wno-unused-but-set-variable"
- 
- # Check for rightly dirs
- AC_CONFIG_SRCDIR([src/main.c])
diff --git a/geeqie.spec b/geeqie.spec
index a899aa2..4092c93 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,9 +1,16 @@
+%global gitcommit 0004617a71100553a13e49e7208e401f2493b72c
+%{?gitcommit:%global gitcommitshort %(c=%{gitcommit}; echo ${c:0:7})}
+
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.4
-Release: 7%{?dist}
+Release: 8%{?gitcommit:.git%{gitcommitshort}}%{?dist}
 License: GPLv2+
+%if %{defined gitcommit}
+Source0: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=snapshot;h=%{gitcommit};sf=tbz2#/geeqie-g%{gitcommitshort}.tar.bz2
+%else
 Source0: http://geeqie.org/geeqie-%{version}.tar.xz
+%endif
 
 BuildRequires: gcc-c++
 BuildRequires: autoconf
@@ -21,15 +28,6 @@ URL: http://geeqie.org
 # add -Wl,--as-needed without disturbing %%configure macro
 Patch0: geeqie-1.1-LDFLAGS.patch
 
-# add -Wno-unused-but-set-variable because upstream added -Werror (good)
-# but we add -Wall so we're more strict. This relaxes that, but we don't
-# want to carry this forever. One issue looks likely harmless
-# https://github.com/BestImageViewer/geeqie/issues/567 and the other looks like
-# probably a bunch of submenus that should be there aren't
-# https://github.com/BestImageViewer/geeqie/issues/566
-# .. in any case, we should remove this patch once upstream has that fixed.
-Patch1: geeqie-1.4-Wno-unused-but-set-variable.patch
-
 # https://github.com/BestImageViewer/geeqie/issues/568
 Patch2: geeqie-1.4-goodbye-changelog.patch
 
@@ -71,8 +69,7 @@ and zoom.
 
 
 %prep
-%setup -q
-%patch1 -p1
+%setup -q %{?gitcommit:-n %{name}-%{gitcommitshort}}
 %patch2 -p1
 autoreconf -f -i ; intltoolize
 # guard against missing executables at (re)build-time,
@@ -92,8 +89,15 @@ sed -i -e 's/lua5\.1/lua-5.1/' configure*
 
 
 %build
+cflags=(
+	-Wno-error=unused-variable
+	-Wno-error=maybe-uninitialized
+	-Wno-error=unused-function
+	-Wno-error=unused-but-set-variable
+)
+
 %configure --enable-lirc --disable-tiff \
-    --with-readmedir=%{_pkgdocdir}
+    --with-readmedir=%{_pkgdocdir} CFLAGS="$CFLAGS ${cflags[*]}"
 %make_build
 
 # work around https://github.com/BestImageViewer/geeqie/issues/568
diff --git a/sources b/sources
index a287797..ef50122 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geeqie-1.4.tar.xz) = a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
+SHA512 (geeqie-g0004617.tar.bz2) = fb12fd5c9a06cb42c590d0e6295f3946ad0069baa1d54a9a8c66a8b157e74a32a2d7d56fb7b2f7096bb409a2408fd6c9faccfc6a058a98a178a912745d539b15