diff --git a/gcc.changes b/gcc.changes
index 57ba9f0..291117b 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jun  5 10:19:50 UTC 2018 - rguenther@suse.com
+
+- Fix gcc-PIE spec to properly honor -no-pie at link time.
+
+-------------------------------------------------------------------
+Tue Mar  6 10:13:50 UTC 2018 - rguenther@suse.com
+
+- Switch gcc to default 8.
+
 -------------------------------------------------------------------
 Fri Jun  9 11:19:29 UTC 2017 - rguenther@suse.com
 
diff --git a/gcc.spec b/gcc.spec
index 59016e4..fea284e 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gcc
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -35,9 +35,9 @@ Name:           gcc
 %define build_ada 0
 %endif
 Url:            http://gcc.gnu.org/
-%define gcc_version 7
-%define gcc_suffix 7
-Version:        7
+%define gcc_version 8
+%define gcc_suffix 8
+Version:        8
 Release:        0
 Summary:        The system GNU C Compiler
 License:        GPL-3.0+
@@ -423,7 +423,7 @@ dir=${dir%/cc1}
 mkdir -p $RPM_BUILD_ROOT/$dir
 cat > $RPM_BUILD_ROOT/$dir/defaults.spec <<EOF
 *default_spec:
-%%{pie|fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE -pie}
+%%{pie|fpic|fPIC|fpie|fPIE|no-pie|fno-pic|fno-PIC|fno-pie|fno-PIE|shared|static|nostdlib|nodefaultlibs|nostartfiles:;:-fPIE -pie}
 EOF
 
 %files