diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index b00da5a1342..d2e32f92a3d 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -352,9 +352,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 # Be strict about variables, bail at earliest opportunity, etc.
 set -eu
 
-# Optional files to include
-touch optional-files-server
-
 #
 # Set environment in order of preference, MYSQL_BUILD_* first, then variable
 # name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
@@ -430,7 +427,6 @@ then
   then
     mkdir -p $RBR%{_libdir}/mysql
     install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
-    echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-server
   fi
 fi
 
@@ -483,6 +479,25 @@ install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}
 # files' warning.
 rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
 
+#
+# Set conditional package options for use in files section
+#
+#  - libmygcc
+#
+%if %{fileexists $RBR%{_libdir}/mysql/libmygcc.a}
+%define WITH_LIBGCC 1
+%else
+%define WITH_LIBGCC 0
+%endif
+#
+#  - innodb
+#
+%if %{fileexists $RBR%{_bindir}/innochecksum}
+%define WITH_INNODB 1
+%else
+%define WITH_INNODB 0
+%endif
+
 ##############################################################################
 #  Post processing actions, i.e. when installed
 ##############################################################################
@@ -660,7 +675,7 @@ fi
 #  Files section
 ##############################################################################
 
-%files -n MySQL-server%{product_suffix} -f optional-files-server
+%files -n MySQL-server%{product_suffix}
 %defattr(-,root,root,0755)
 
 %if %{defined license_files_server}
@@ -671,7 +686,7 @@ fi
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 
-%if %{fileexists $RPM_BUILD_ROOT%{_mandir}/man1/innochecksum.1*}
+%if %{WITH_INNODB}
 %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
 %endif
 %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
@@ -703,7 +718,7 @@ fi
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 
-%if %{fileexists $RPM_BUILD_ROOT%{_bindir}/innochecksum}
+%if %{WITH_INNODB}
 %attr(755, root, root) %{_bindir}/innochecksum
 %endif
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -795,6 +810,9 @@ fi
 %dir %attr(755, root, root) %{_libdir}/mysql
 %{_includedir}/mysql/*
 %{_datadir}/aclocal/mysql.m4
+%if %{WITH_LIBGCC}
+%{_libdir}/mysql/libmygcc.a
+%endif
 %{_libdir}/mysql/libmysqlclient.a
 %{_libdir}/mysql/libmysqlclient_r.a
 %{_libdir}/mysql/libmysqlservices.a