diff --git a/gmp-6.1.1.tar.bz2 b/gmp-6.1.1.tar.bz2
deleted file mode 100644
index 7e217d7..0000000
--- a/gmp-6.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
-size 2384919
diff --git a/gmp-6.1.1.tar.bz2.sig b/gmp-6.1.1.tar.bz2.sig
deleted file mode 100644
index a8ebbb2..0000000
Binary files a/gmp-6.1.1.tar.bz2.sig and /dev/null differ
diff --git a/gmp-6.1.1.tar.xz b/gmp-6.1.1.tar.xz
new file mode 100644
index 0000000..6b98384
--- /dev/null
+++ b/gmp-6.1.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d36e9c05df488ad630fff17edb50051d6432357f9ce04e34a09b3d818825e831
+size 1943164
diff --git a/gmp-6.1.1.tar.xz.sig b/gmp-6.1.1.tar.xz.sig
new file mode 100644
index 0000000..5f49506
Binary files /dev/null and b/gmp-6.1.1.tar.xz.sig differ
diff --git a/gmp.changes b/gmp.changes
index d6ab980..b0adc6b 100644
--- a/gmp.changes
+++ b/gmp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 30 07:34:19 UTC 2016 - mpluskal@suse.com
+
+- Use macro for configure (as bsc#870358) is already fixed
+- Use xz compressed archives
+- Update info pages dependencies
+
 -------------------------------------------------------------------
 Thu Jun 23 21:04:04 UTC 2016 - astieger@suse.com
 
diff --git a/gmp.spec b/gmp.spec
index a52e545..83cd8b5 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -23,12 +23,13 @@ Summary:        The GNU MP Library
 License:        GPL-3.0+ and LGPL-3.0+
 Group:          System/Libraries
 Url:            https://gmplib.org/
-Source0:        https://gmplib.org/download/%{name}/%{name}-%{version}.tar.bz2
-Source1:        https://gmplib.org/download/%{name}/%{name}-%{version}.tar.bz2.sig
+Source0:        https://gmplib.org/download/%{name}/%{name}-%{version}.tar.xz
+Source1:        https://gmplib.org/download/%{name}/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
 Patch0:         gmp-noexec.diff
 BuildRequires:  gcc-c++
+BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -58,6 +59,7 @@ Group:          Development/Languages/C and C++
 Requires:       libgmp10 = %{version}
 Requires:       libgmpxx4 = %{version}
 Requires(pre):  %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 
 %description devel
 These libraries are needed to develop programs which calculate with
@@ -68,18 +70,10 @@ huge numbers (integer and floating point).
 %patch0
 
 %build
-# Do not use %%configure here, that will break build on SLE11 because
-# there we pass a mismatched --target.  See bnc#870358.
 export CFLAGS="%{optflags} -fexceptions"
-# FIXME: you should use the %%configure macro
-./configure \
-	--host=%{_host} \
-	--build=%{_build} \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-        --enable-cxx \
-        --enable-fat
-
+%configure \
+  --enable-cxx \
+  --enable-fat
 make %{?_smp_mflags}
 
 %check
@@ -94,13 +88,15 @@ rm %{buildroot}%{_libdir}/libgmpxx.a
 
 %post -n libgmp10 -p /sbin/ldconfig
 %post -n libgmpxx4 -p /sbin/ldconfig
-%post devel
-%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %postun -n libgmp10 -p /sbin/ldconfig
 %postun -n libgmpxx4 -p /sbin/ldconfig
-%postun devel
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+
+%post devel
+%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
+
+%preun devel
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %files -n libgmp10
 %defattr(-,root,root)