diff --git a/geeqie.changes b/geeqie.changes
index 841143b..8ada73b 100644
--- a/geeqie.changes
+++ b/geeqie.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep  1 19:27:12 UTC 2017 - zaitor@opensuse.org
+
+- Enable pkgconfig(champlain-0.12), add
+  pkgconfig(champlain-gtk-0.12), pkgconfig(clutter-1.0) and
+  pkgconfig(clutter-gtk-1.0) BuildRequires and pass --enable-maps
+  to configure: Build map support (boo#1054718).
+- Enable conditional pkgconfig(lua5.1) BuildRequires and stop
+  passing --disable-lua to configure: New lua is now in place in
+  Tumbleweed, build lua support.
+
 -------------------------------------------------------------------
 Thu Jul 27 16:51:31 UTC 2017 - tchvatal@suse.com
 
diff --git a/geeqie.spec b/geeqie.spec
index d6368c2..fc2a3c9 100644
--- a/geeqie.spec
+++ b/geeqie.spec
@@ -36,15 +36,18 @@ 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(champlain-0.12) >= 0.12
+BuildRequires:  pkgconfig(champlain-gtk-0.12) >= 0.12
+BuildRequires:  pkgconfig(clutter-1.0) >= 1.0
+BuildRequires:  pkgconfig(clutter-gtk-1.0) >= 1.0
 BuildRequires:  pkgconfig(exiv2) >= 0.11
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(lcms2)
+%if 0%{?suse_version} >= 1330
+BuildRequires:  pkgconfig(lua5.1)
+%endif
 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
 
 %description
@@ -62,7 +65,8 @@ autoreconf -fvi
 %configure \
         --enable-lirc \
         --with-readmedir=%{_defaultdocdir}/%{name} \
-        --disable-lua
+        --enable-map \
+        %{nil}
 make %{?_smp_mflags}
 
 %install