diff --git a/boost-autoconf-20100819.tar.bz2 b/boost-autoconf-20100819.tar.bz2
deleted file mode 100644
index 29ef3e5..0000000
--- a/boost-autoconf-20100819.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:510c2e9cc86393599c1054b68b9e0debc8d6ad4abfcce2869b690d3987e3a741
-size 9452
diff --git a/boost-lib64.patch b/boost-lib64.patch
deleted file mode 100644
index ea430ed..0000000
--- a/boost-lib64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: m4/ax_boost_base.m4
-===================================================================
---- m4/ax_boost_base.m4.orig	2010-08-19 00:00:00.000000000 +0200
-+++ m4/ax_boost_base.m4	2010-08-26 17:53:43.000000000 +0200
-@@ -84,15 +84,18 @@ if test "x$want_boost" = "xyes"; then
-     AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
-     succeeded=no
- 
--    dnl On x86_64 systems check for system libraries in both lib64 and lib.
-+    dnl On x86_64, ppc64 and s390x systems check for system libraries in both lib64 and lib.
-     dnl The former is specified by FHS, but e.g. Debian does not adhere to
-     dnl this (as it rises problems for generic multi-arch support).
-     dnl The last entry in the list is chosen by default when no libraries
-     dnl are found, e.g. when only header-only libraries are installed!
-+
-     libsubdirs="lib"
--    if test `uname -m` = x86_64; then
--        libsubdirs="lib64 lib lib64"
--    fi
-+    case `uname -m` in
-+        x86_64 | ppc64 | s390x)
-+        	libsubdirs="lib64 lib lib64"
-+        	;;
-+    esac 
- 
-     dnl first we check the system location for boost libraries
-     dnl this location ist chosen if boost libraries are installed with the --layout=system option
diff --git a/boost.changes b/boost.changes
index c9d18f5..8b13d7c 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 25 12:01:42 CET 2010 - pth@suse.de
+
+- Remove the boost specific autoconf macros now that we have the
+  complete autoconf archive packaged (bnc#655747).
+- Move the lib64 patch over to autoconf-archive.
+
 -------------------------------------------------------------------
 Mon Oct 25 07:32:01 UTC 2010 - jslaby@novell.com
 
diff --git a/boost.spec b/boost.spec
index fbc4cec..311086e 100644
--- a/boost.spec
+++ b/boost.spec
@@ -84,14 +84,12 @@ Source1:        boost-rpmlintrc
 Source2:        %{name}_%{short_version}_man.tar.bz2
 Source3:        %{name}_%{short_version}_pdf.tar.bz2
 Source4:        existing_extra_docs
-Source5:        boost-autoconf-%{archive_version}.tar.bz2
 Patch1:         boost-thread.patch
 Patch2:         boost-no_type_punning.patch
 Patch4:         boost-visit_each.diff
 Patch8:         boost-no_segfault_in_Regex_filter.patch
 Patch19:        boost-sane_versioning.patch
 Patch20:        boost-strict_aliasing.patch
-Patch21:        boost-lib64.patch
 Patch50:        boost-use_std_xml_catalog.patch
 Patch51:        boost-fix_documentation.patch 
 Recommends:     %{all_libs}
@@ -420,11 +418,11 @@ This package contains the Boost:Random runtime library.
 
 %prep
 %if %build_docs
-%setup -q -n %{name}_%{file_version} -a 5 -b 3
+%setup -q -n %{name}_%{file_version} -b 3
 %else
-%setup -q -n %{name}_%{file_version} -a 2 -a 5 -b 3
+%setup -q -n %{name}_%{file_version} -a 2 -b 3
 %endif
-#everything in the tarball has the executable flag set ......
+#everything in the tarball has the executable flag set ...
 find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} +
 %patch1
 %patch2
@@ -432,7 +430,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch8
 %patch19
 %patch20
-%patch21
 %patch50
 %patch51