diff --git a/gcc.changes b/gcc.changes
index 9f19b1e..57ba9f0 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Jun  9 11:19:29 UTC 2017 - rguenther@suse.com
+
+- Fix gcc-devel guard to use %sle_version.  [bnc#1043590]
+
+-------------------------------------------------------------------
+Wed Jun  7 11:39:55 UTC 2017 - rguenther@suse.com
+
+- Guard gcc-devel so it is only built on Tumbleweed.
+- Remove bogus link to versioned g++.info file which doesn't exist.
+  Instead refer to gcc.info from the g++ info directory entry.
+  [bnc#922419]
+
+-------------------------------------------------------------------
+Tue Jun  6 09:55:59 UTC 2017 - mliska@suse.cz
+
+- Include gcov-tool and gcov-dump binaries.
+
 -------------------------------------------------------------------
 Thu Apr 13 08:52:35 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc.spec b/gcc.spec
index 44bc985..59016e4 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -128,7 +128,7 @@ The system GNU Compiler documentation.
 %post -n gcc-info
 %install_info --info-dir=%{_infodir} --name=cpp --description='The GNU C preprocessor.' %{_infodir}/cpp.info.gz
 %install_info --info-dir=%{_infodir} --name=gcc --description='The GNU Compiler Collection.' %{_infodir}/gcc.info.gz
-%install_info --info-dir=%{_infodir} --name=g++ --description='The GNU C++ compiler.' %{_infodir}/g++.info.gz
+%install_info --info-dir=%{_infodir} --name=g++ --description='The GNU C++ compiler.' %{_infodir}/gcc.info.gz
 %install_info --info-dir=%{_infodir} --name=gfortran --description='The GNU Fortran compiler.' %{_infodir}/gfortran.info.gz
 
 # if we uninstall, clean the entries
@@ -136,7 +136,7 @@ The system GNU Compiler documentation.
 if [ "$1" -eq "0" ] ; then
   %install_info --delete --info-dir=%{_infodir} --name=cpp %{_infodir}/cpp.info.gz
   %install_info --delete --info-dir=%{_infodir} --name=gcc %{_infodir}/gcc.info.gz
-  %install_info --delete --info-dir=%{_infodir} --name=g++ %{_infodir}/g++.info.gz
+  %install_info --delete --info-dir=%{_infodir} --name=g++ %{_infodir}/gcc.info.gz
   %install_info --delete --info-dir=%{_infodir} --name=gfortran %{_infodir}/gfortran.info.gz
 fi
 
@@ -381,7 +381,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-objc/
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-obj-c++/
 # Link all the binaries
 for program in \
-        gcc gcov \
+        gcc gcov gcov-dump gcov-tool \
         g++ \
         cpp \
         gfortran \
@@ -395,7 +395,7 @@ for program in \
 done
 # Link section 1 manpages
 for man1 in \
-        gcc gcov \
+        gcc gcov gcov-dump gcov-tool \
         g++ \
         cpp \
         gfortran \
@@ -403,7 +403,7 @@ for man1 in \
   ln -sf $man1-%{gcc_suffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/$man1.1.gz
 done
 # Link info pages
-for info in cpp gcc g++ gfortran ; do
+for info in cpp gcc gfortran ; do
   ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
 done
 # Provide the traditional /lib/cpp that only handles C
@@ -431,6 +431,8 @@ EOF
 %{_prefix}/bin/gcc
 %{_prefix}/bin/cc
 %{_prefix}/bin/gcov
+%{_prefix}/bin/gcov-dump
+%{_prefix}/bin/gcov-tool
 %{_prefix}/bin/gcc-ar
 %{_prefix}/bin/gcc-nm
 %{_prefix}/bin/gcc-ranlib
@@ -439,6 +441,8 @@ EOF
 %doc %{_mandir}/man1/gcc.1.gz
 %doc %{_mandir}/man1/cc.1.gz
 %doc %{_mandir}/man1/gcov.1.gz
+%doc %{_mandir}/man1/gcov-dump.1.gz
+%doc %{_mandir}/man1/gcov-tool.1.gz
 
 %files -n cpp
 %defattr(-,root,root)
@@ -446,9 +450,12 @@ EOF
 %{_prefix}/bin/cpp
 %doc %{_mandir}/man1/cpp.1.gz
 
+# Plugins are only enabled for Tumbleweed
+%if 0%{!?sle_version:1}
 %files -n gcc-devel
 %defattr(-,root,root)
 # empty - only for the dependency
+%endif
 
 %files -n gcc-c++
 %defattr(-,root,root)
@@ -482,7 +489,6 @@ EOF
 %defattr(-,root,root)
 %{_infodir}/cpp.info.gz
 %{_infodir}/gcc.info.gz
-%{_infodir}/g++.info.gz
 %{_infodir}/gfortran.info.gz
 
 %if %{build_ada}