diff --git a/gdb-archer.patch b/gdb-archer.patch
index 90e6d10..178cae0 100644
--- a/gdb-archer.patch
+++ b/gdb-archer.patch
@@ -2,7 +2,7 @@ http://sourceware.org/gdb/wiki/ProjectArcher
 http://sourceware.org/gdb/wiki/ArcherBranchManagement
 
 GIT snapshot:
-commit 543fb2154d3bd551344b990b911be5c6cc703504
+commit ec29855686f2a78d90ebcc63765681249bbbe808
 
 branch `archer' - the merge of branches:
 archer-jankratochvil-merge-expr
@@ -20860,10 +20860,10 @@ index 0000000..fe7c072
 +register_libstdcxx_printers (gdb.current_objfile ())
 diff --git a/gdb/python/lib/gdb/libstdcxx/v6/printers.py b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
 new file mode 100644
-index 0000000..ccef97d
+index 0000000..c0dc987
 --- /dev/null
 +++ b/gdb/python/lib/gdb/libstdcxx/v6/printers.py
-@@ -0,0 +1,646 @@
+@@ -0,0 +1,647 @@
 +# Pretty-printers for libstc++.
 +
 +# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
@@ -21481,6 +21481,7 @@ index 0000000..ccef97d
 +    pretty_printers_dict[re.compile('^std::stack<.*>$')] = lambda val: StdStackOrQueuePrinter("std::stack", val)
 +    pretty_printers_dict[re.compile('^std::unique_ptr<.*>$')] = UniquePointerPrinter
 +    pretty_printers_dict[re.compile('^std::vector<.*>$')] = StdVectorPrinter
++    # vector<bool>
 +
 +    # These are the C++0x printers. They also exist in the standard namespace.
 +    # For array - the default GDB pretty-printer seems reasonable.
@@ -21492,7 +21493,7 @@ index 0000000..ccef97d
 +    pretty_printers_dict[re.compile('^std::(tr1::)?unordered_multiset<.*>$')] = lambda val: Tr1UnorderedSetPrinter ('std::tr1::unordered_multiset', val)
 +
 +
-+    # Extensions to std, tr1 pretty-printers.
++    # Extensions.
 +    pretty_printers_dict[re.compile('^__gnu_cxx::slist<.*>$')] = StdSlistPrinter
 +
 +    if True:
diff --git a/gdb.spec b/gdb.spec
index bc576c2..da2730c 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -13,7 +13,7 @@ Version: 6.8.50.20090302
 
 # 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: 6%{?_with_upstream:.upstream}%{?dist}
+Release: 7%{?_with_upstream:.upstream}%{?dist}
 
 License: GPLv3+
 Group: Development/Debuggers
@@ -384,6 +384,8 @@ BuildRequires: rpm-devel
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Requires: python-libs
 BuildRequires: python-devel
+# Temporarily before it gets moved to libstdc++.rpm
+BuildRequires: libstdc++
 
 %if 0%{?_with_testsuite:1}
 BuildRequires: sharutils dejagnu
@@ -762,8 +764,17 @@ ln -sf gdb $RPM_BUILD_ROOT%{_prefix}/bin/gdbtui
 cmp $RPM_BUILD_ROOT%{_mandir}/*/gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/*/gdbtui.1
 
-# A part of the libstdc++ rpm.
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+# In the future:
+#%# A part of the libstdc++ rpm.
+#%rm -rf $RPM_BUILD_ROOT%{python_sitelib}/gdb/libstdcxx
+# Temporarily now:
+for LIB in lib lib64;do
+  LIBPATH="$RPM_BUILD_ROOT%{_datadir}/gdb/auto-load%{_prefix}/$LIB"
+  mkdir -p $LIBPATH
+  # basename is being run only for the native (non-biarch) file.
+  sed -e 's,@dir@,%{python_sitelib}/gdb,' <$RPM_BUILD_DIR/%{gdb_src}/gdb/python/lib/gdb/libstdcxx/v6/hook.in \
+      >$LIBPATH/$(basename %{_prefix}/%{_lib}/libstdc++.so.6.*)-gdb.py
+done
 
 # Remove the files that are part of a gdb build but that are owned and
 # provided by other packages.
@@ -840,6 +851,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar  9 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-7
+- Archer update to the snapshot: ec29855686f2a78d90ebcc63765681249bbbe808
+- Temporarily place libstdc++ pretty printers in this gdb.rpm.
+
 * Sat Mar  7 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-6
 - Archer update to the snapshot: 543fb2154d3bd551344b990b911be5c6cc703504
  - Fixes [delayed-symfile] excessive `(no debugging symbols found)' messages.