diff --git a/.cvsignore b/.cvsignore
index 00e2fe3..341e597 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-swig-1.3.35.tar.gz
+swig-1.3.36.tar.gz
diff --git a/sources b/sources
index fe9adf2..0204936 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c2ca2332ebcdab55aa98518111d7cc9  swig-1.3.35.tar.gz
+8f30aa4130b62404099bbcba1bf429b1  swig-1.3.36.tar.gz
diff --git a/swig-arch.patch b/swig-arch.patch
deleted file mode 100644
index 9309bb5..0000000
--- a/swig-arch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up swig-1.3.35/Source/Preprocessor/cpp.c.arch swig-1.3.35/Source/Preprocessor/cpp.c
---- swig-1.3.35/Source/Preprocessor/cpp.c.arch	2008-05-16 10:10:38.000000000 +0200
-+++ swig-1.3.35/Source/Preprocessor/cpp.c	2008-05-16 10:15:40.000000000 +0200
-@@ -187,6 +187,14 @@ void Preprocessor_init(void) {
- 
-   id_scan = NewScanner();;
- 
-+#ifdef __x86_64__
-+  Preprocessor_define("__x86_64__", 0);
-+#elif defined(__powerpc64__)
-+  Preprocessor_define("__powerpc64__", 0);
-+#else
-+  Preprocessor_define("__i386__", 0);
-+#endif
-+
- }
- 
- void Preprocessor_delete(void) {
diff --git a/swig.spec b/swig.spec
index 86275e5..ef5edb7 100644
--- a/swig.spec
+++ b/swig.spec
@@ -3,19 +3,14 @@
 
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
-Version: 1.3.35
-Release: 2%{?dist}
+Version: 1.3.36
+Release: 1%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
 Source: http://download.sourceforge.net/swig/swig-%{version}.tar.gz
 Patch1: swig-1.3.23-pylib.patch
 
-# XXX This patch will be never accepted by upstream
-# https://sourceforge.net/tracker/?func=detail&atid=101645&aid=1604332&group_id=1645
-# but it is typical distribution patch and should be kept downstream
-Patch2: swig-arch.patch
-
 BuildRoot: %{_tmppath}/swig-root
 BuildRequires: perl, python-devel
 %if %{tcl}
@@ -38,7 +33,6 @@ tool for building user interfaces.
 %prep
 %setup -q -n swig-%{version}
 %patch1 -p1 -b .pylib
-%patch2 -p1 -b .arch
 
 %build
 ./autogen.sh
@@ -48,6 +42,8 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# XXX workaround for https://bugzilla.redhat.com/show_bug.cgi?id=470811
+rm -f Doc/Manual/Perl5.html
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
@@ -65,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/swig
 
 %changelog
+* Mon Nov 10 2008 Adam Tkac <atkac redhat com> 1.3.36-1
+- updated to 1.3.36
+- finally dropped swig-arch.patch
+- temporary workaround rpm bug #470811
+
 * Fri May 16 2008 Adam Tkac <atkac redhat com> 1.3.35-2
 - readded swig-arch.patch, will be kept downstream