diff --git a/gettext.spec b/gettext.spec
index bbf065c..8acf24a 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -1,7 +1,6 @@
 %bcond_with jar
 %bcond_with java
 %bcond_without check
-%bcond_without git
 
 %global tarversion 0.19.8.1
 %global archiveversion 0.19.8
@@ -9,7 +8,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.19.8.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -41,10 +40,10 @@ BuildRequires: zip, unzip
 %endif
 # for po-mode.el
 BuildRequires: emacs
-%if %{with git}
-# for autopoint:
+# for autosetup
 BuildRequires: git
-%endif
+# ensure 'ARCHIVE_FORMAT=dirxz'
+BuildRequires: xz
 BuildRequires: chrpath
 # following suggested by DEPENDENCIES:
 BuildRequires: ncurses-devel
@@ -96,10 +95,6 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-common-devel = %{version}-%{release}
 Requires(post): info
 Requires(preun): info
-%if %{with git}
-# for autopoint
-Requires: git
-%endif
 Requires: xz
 Obsoletes: gettext-autopoint < 0.18.1.1-3
 Provides: gettext-autopoint = %{version}-%{release}
@@ -167,10 +162,7 @@ export CFLAGS="$RPM_OPT_FLAGS -D__SUPPORT_SNAN__"
 %else
     --disable-java --disable-native-java \
 %endif
-%if %{without git}
-    --disable-git \
-%endif
-%{nil}
+    --with-xz
 
 make %{?_smp_mflags} %{?with_java:GCJFLAGS="-findirect-dispatch"}
 
@@ -358,6 +350,10 @@ fi
 %{_mandir}/man1/msghack.1*
 
 %changelog
+* Thu Jan 26 2017 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-7
+- really remove Requires: git from gettext-devel (rhbz#1161284)
+- make the BuildRequires unconditional (rhbz#1416691)
+
 * Wed Dec 21 2016 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-6
 - disable test-lock for 'gettext-tool' subdir too (rhbz#1406031)