diff --git a/gmp-6.1.0.tar.bz2 b/gmp-6.1.0.tar.bz2
deleted file mode 100644
index ed5f569..0000000
--- a/gmp-6.1.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:498449a994efeba527885c10405993427995d3f86b8768d8cdf8d9dd7c6b73e8
-size 2383840
diff --git a/gmp-6.1.0.tar.bz2.sig b/gmp-6.1.0.tar.bz2.sig
deleted file mode 100644
index 2d4de5c..0000000
Binary files a/gmp-6.1.0.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 46e4579..b0adc6b 100644
--- a/gmp.changes
+++ b/gmp.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
+
+- gmp 6.1.1:
+  * Work around faulty cpuid on some recent Intel chips (this
+    allows GMP to run on Skylake Pentiums).
+
 -------------------------------------------------------------------
 Mon Nov  2 08:57:09 UTC 2015 - rguenther@suse.com
 
diff --git a/gmp.spec b/gmp.spec
index 3c0a407..83cd8b5 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gmp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,18 +17,19 @@
 
 
 Name:           gmp
-Version:        6.1.0
+Version:        6.1.1
 Release:        0
 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
@@ -57,7 +58,8 @@ Summary:        Include Files and Libraries for Development with the GNU MP Libr
 Group:          Development/Languages/C and C++
 Requires:       libgmp10 = %{version}
 Requires:       libgmpxx4 = %{version}
-Requires(pre):	%{install_info_prereq}
+Requires(pre):  %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 
 %description devel
 These libraries are needed to develop programs which calculate with
@@ -68,17 +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"
-./configure \
-	--host=%{_host} \
-	--build=%{_build} \
-	--prefix=%{_prefix} \
-	--libdir=%{_libdir} \
-        --enable-cxx \
-        --enable-fat
-
+%configure \
+  --enable-cxx \
+  --enable-fat
 make %{?_smp_mflags}
 
 %check
@@ -86,24 +81,22 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} check
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 rm %{buildroot}%{_libdir}/libgmp.la
 rm %{buildroot}%{_libdir}/libgmpxx.la
 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)
@@ -117,7 +110,7 @@ rm %{buildroot}%{_libdir}/libgmpxx.a
 %defattr(-,root,root)
 %doc AUTHORS README NEWS
 %doc demos
-%doc %{_infodir}/gmp.info*.gz
+%{_infodir}/gmp.info*%{ext_info}
 %{_libdir}/libgmp.a
 %{_libdir}/libgmp.so
 %{_libdir}/libgmpxx.so