diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-aarch64-gcc7.changes
+++ b/cross-aarch64-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-arm-gcc7.changes
+++ b/cross-arm-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes
index a3acc5b..80ef042 100644
--- a/cross-avr-gcc7-bootstrap.changes
+++ b/cross-avr-gcc7-bootstrap.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-avr-gcc7.changes
+++ b/cross-avr-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes
index a3acc5b..80ef042 100644
--- a/cross-epiphany-gcc7-bootstrap.changes
+++ b/cross-epiphany-gcc7-bootstrap.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-epiphany-gcc7.changes
+++ b/cross-epiphany-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-hppa-gcc7.changes
+++ b/cross-hppa-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-i386-gcc7.changes
+++ b/cross-i386-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-m68k-gcc7.changes
+++ b/cross-m68k-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-mips-gcc7.changes
+++ b/cross-mips-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-nvptx-gcc7.changes
+++ b/cross-nvptx-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-ppc64-gcc7.changes
+++ b/cross-ppc64-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-ppc64le-gcc7.changes
+++ b/cross-ppc64le-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes
index a3acc5b..80ef042 100644
--- a/cross-rx-gcc7-bootstrap.changes
+++ b/cross-rx-gcc7-bootstrap.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-rx-gcc7.changes
+++ b/cross-rx-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-s390x-gcc7.changes
+++ b/cross-s390x-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-sparc-gcc7.changes
+++ b/cross-sparc-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-sparc64-gcc7.changes
+++ b/cross-sparc64-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes
index a3acc5b..80ef042 100644
--- a/cross-x86_64-gcc7.changes
+++ b/cross-x86_64-gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc.spec.in b/gcc.spec.in
index 3dbe8ca..09dc49f 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1463,6 +1463,7 @@ fi
 for libname in \
 %if %{build_fortran}
   libgfortran \
+%endif
 %ifarch %quadmath_arch
   libquadmath \
 %endif
@@ -1508,7 +1509,6 @@ for libname in \
 %endif
 %ifarch %mpx_arch
   libmpx libmpxwrappers \
-%endif
 %endif
     ; do
   for lib in `find $RPM_BUILD_ROOT%{versmainlibdir} -maxdepth 1 -name $libname.so.*`; do
diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes
index a3acc5b..80ef042 100644
--- a/gcc7-testresults.changes
+++ b/gcc7-testresults.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7.changes b/gcc7.changes
index a3acc5b..80ef042 100644
--- a/gcc7.changes
+++ b/gcc7.changes
@@ -3,6 +3,16 @@ Mon Jan 22 11:55:05 UTC 2018 - rguenther@suse.com
 
 - Update to GCC 7.3.0 RC2 (r256937).
 
+-------------------------------------------------------------------
+Mon Jan 22 11:29:58 UTC 2018 - schwab@suse.de
+
+- Move misplaced %endif
+
+-------------------------------------------------------------------
+Wed Jan 17 13:13:12 UTC 2018 - rguenther@suse.com
+
+- Update to GCC 7.3.0 RC1 (r256792).
+
 -------------------------------------------------------------------
 Tue Jan 16 11:29:06 UTC 2018 - rguenther@suse.com
 
diff --git a/gcc7.spec b/gcc7.spec
index 3efcb0a..f73af16 100644
--- a/gcc7.spec
+++ b/gcc7.spec
@@ -2150,6 +2150,7 @@ fi
 for libname in \
 %if %{build_fortran}
   libgfortran \
+%endif
 %ifarch %quadmath_arch
   libquadmath \
 %endif
@@ -2195,7 +2196,6 @@ for libname in \
 %endif
 %ifarch %mpx_arch
   libmpx libmpxwrappers \
-%endif
 %endif
     ; do
   for lib in `find $RPM_BUILD_ROOT%{versmainlibdir} -maxdepth 1 -name $libname.so.*`; do