diff --git a/geeqie.changes b/geeqie.changes
index 8d3c1c6..841143b 100644
--- a/geeqie.changes
+++ b/geeqie.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 27 16:51:31 UTC 2017 - tchvatal@suse.com
+
+- Run just autoreconf and intltoolize, to avoid double configure run
+- Add deps for post/postun scriptlets
+- Remove dep on lcms and depend on lcms2
+
 -------------------------------------------------------------------
 Tue Mar  7 11:59:13 UTC 2017 - zaitor@opensuse.org
 
diff --git a/geeqie.spec b/geeqie.spec
index fac8e56..d6368c2 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package geeqie
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,16 +34,18 @@ BuildRequires:  libtiff-devel
 # Needed to bootstrap the tarball
 BuildRequires:  libtool
 BuildRequires:  lirc-devel
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 # Disabled as libchamplain support is still marked as experimental
 #BuildRequires:  pkgconfig(champlain-0.12) >= 0.12
 BuildRequires:  pkgconfig(exiv2) >= 0.11
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(lcms) >= 1.14
-# FIXME! Blasted configure does not find it..... - looks for lua5.1
+BuildRequires:  pkgconfig(lcms2)
+Requires(post): update-desktop-files
+Requires(postun): update-desktop-files
+# FIXME: Enable when new lua layout lands in TW
 #BuildRequires:  pkgconfig(lua-5.1) >= 5.1
 Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
@@ -55,10 +57,12 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
 
 %build
 # Needed to bootstrap
-./autogen.sh
+intltoolize --copy --force --automake
+autoreconf -fvi
 %configure \
         --enable-lirc \
-        --with-readmedir=%{_defaultdocdir}/%{name}
+        --with-readmedir=%{_defaultdocdir}/%{name} \
+        --disable-lua
 make %{?_smp_mflags}
 
 %install
@@ -74,7 +78,6 @@ make %{?_smp_mflags}
 %desktop_database_postun
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO README.lirc
 %{_bindir}/geeqie
 %{_datadir}/applications/geeqie.desktop
@@ -84,6 +87,5 @@ make %{?_smp_mflags}
 %{_mandir}/man1/geeqie.1%{?ext_man}
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %changelog