diff --git a/gdb.spec b/gdb.spec
index c4def81..7a5982b 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.7.1
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -1154,16 +1154,17 @@ done
 test ! -e $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
 cp -a $RPM_BUILD_DIR/%{gdb_src}/%{libstdcxxpython}/libstdcxx	\
       $RPM_BUILD_ROOT%{_datadir}/gdb/python/libstdcxx
-for i in `find $RPM_BUILD_ROOT%{_datadir}/gdb/python -name "*.py"` \
-         `find $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix} -name "*.py"` \
-; do
+for i in `find $RPM_BUILD_ROOT%{_datadir}/gdb -name "*.py"`; do
   # Files come from gdb-archer.patch and can be also further patched.
+  # They are also installed by install(1) not preserving the timestamps.
   touch -r $RPM_BUILD_DIR/%{gdb_src}/gdb/ChangeLog $i
 done
 %else # 0%{!?rhel:1} || 0%{?rhel} > 6
 # BZ 999645: /usr/share/gdb/auto-load/ needs filesystem symlinks
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load
 for i in $(echo bin lib $(basename %{_libdir}) sbin|tr ' ' '\n'|sort -u);do
+  # mkdir to satisfy dangling symlinks build check.
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load/%{_root_prefix}/$i
   ln -s $(echo %{_root_prefix}|sed 's#^/*##')/$i \
         $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load/$i
 done
@@ -1309,6 +1310,10 @@ then
 fi
 
 %changelog
+* Tue Jun  3 2014 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.7.1-19.fc21
+- Fix /usr/share/gdb/auto-load/ (safely) dangling symlinks.
+- Fix /usr/share/gdb/system-gdbinit/ timestamps causing non-matching *.py[oc].
+
 * Tue Jun  3 2014 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.7.1-18.fc21
 - [ppc64le testsuite] Add comments about prelink+valgrind not yet ported.