diff --git a/.gitignore b/.gitignore
index 5afbc05..2edcf1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /gcc-6.0.0-20160331.tar.bz2
 /gcc-6.0.0-20160406.tar.bz2
 /gcc-6.1.1-20160427.tar.bz2
+/gcc-6.1.1-20160510.tar.bz2
diff --git a/gcc.spec b/gcc.spec
index 741558c..256fe5f 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,9 +1,9 @@
-%global DATE 20160427
-%global SVNREV 235510
+%global DATE 20160510
+%global SVNREV 236095
 %global gcc_version 6.1.1
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 1
+%global gcc_release 2
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
 # Hardening slows the compiler way too much.
@@ -2449,7 +2449,6 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/liblsan.so
 %endif
 %endif
-%dir %{_prefix}/libexec/getconf
 %{_prefix}/libexec/getconf/default
 %doc gcc/README* rpm.doc/changelogs/gcc/ChangeLog* 
 %{!?_licensedir:%global license %%doc}
@@ -3101,6 +3100,14 @@ fi
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Tue May 10 2016 Jakub Jelinek <jakub@redhat.com> 6.1.1-2
+- update from the 6 branch
+  - PRs ada/70759, ada/70786, ada/70900, ada/70969, c++/70540, debug/70935,
+	java/70839, middle-end/70626, sanitizer/70342, sanitizer/70875,
+	target/60290, target/70858, tree-optimization/70916,
+	tree-optimization/70956
+- don't own %{_prefix}/libexec/getconf directory, as glibc owns it (#1333616)
+
 * Wed Apr 27 2016 Jakub Jelinek <jakub@redhat.com> 6.1.1-1
 - update from the trunk and 6 branch
   - GCC 6.1 release
diff --git a/sources b/sources
index 24d5e58..5c1b140 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6b454487c37355ef5ab1a68657b20aa  gcc-6.1.1-20160427.tar.bz2
+edc50b4c777289cd46e6837a72cbeba8  gcc-6.1.1-20160510.tar.bz2