diff --git a/fix_cpan_pmda_manifest.patch b/fix_cpan_pmda_manifest.patch
deleted file mode 100644
index 98d3712..0000000
--- a/fix_cpan_pmda_manifest.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: pcp-3.6.4/src/cpan/PMDA/MANIFEST
-===================================================================
---- pcp-3.6.4.orig/src/cpan/PMDA/MANIFEST
-+++ pcp-3.6.4/src/cpan/PMDA/MANIFEST
-@@ -9,4 +9,3 @@ local.h
- local.c
- test.pl
- typemap
--META.yml                                 Module meta-data (added by MakeMaker)
-Index: pcp-3.6.4/src/cpan/LogImport/MANIFEST
-===================================================================
---- pcp-3.6.4.orig/src/cpan/LogImport/MANIFEST
-+++ pcp-3.6.4/src/cpan/LogImport/MANIFEST
-@@ -5,4 +5,3 @@ MANIFEST
- LogImport.pm
- LogImport.xs
- typemap
--META.yml                                 Module meta-data (added by MakeMaker)
-Index: pcp-3.6.4/src/cpan/LogSummary/MANIFEST
-===================================================================
---- pcp-3.6.4.orig/src/cpan/LogSummary/MANIFEST
-+++ pcp-3.6.4/src/cpan/LogSummary/MANIFEST
-@@ -18,4 +18,3 @@ t/db/20081125.0
- t/db/20081126.index
- t/db/20081126.meta
- t/db/20081126.0
--META.yml                                 Module meta-data (added by MakeMaker)
-Index: pcp-3.6.4/src/cpan/MMV/MANIFEST
-===================================================================
---- pcp-3.6.4.orig/src/cpan/MMV/MANIFEST
-+++ pcp-3.6.4/src/cpan/MMV/MANIFEST
-@@ -7,4 +7,3 @@ MMV.xs
- server.pl
- test.pl
- typemap
--META.yml                                 Module meta-data (added by MakeMaker)
diff --git a/pcp-3.6.4-1.src.tar.gz b/pcp-3.6.4-1.src.tar.gz
index 84ab81a..60169bf 100644
--- a/pcp-3.6.4-1.src.tar.gz
+++ b/pcp-3.6.4-1.src.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac6de94daf87b4b514cc8abd71a758c22ab63a5bf7840bae19cabd6771543b23
-size 2409400
+oid sha256:3619ae0dd8efd2f265e96c32b18bf7c0e6b2d95cea8415ebae9460635400de3f
+size 2407734
diff --git a/pcp.changes b/pcp.changes
index 3274446..2844987 100644
--- a/pcp.changes
+++ b/pcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 27 10:36:49 UTC 2012 - ddiss@suse.com
+
+- Remove fix_cpan_pmda_manifest.patch, no longer needed with fixed
+  upstream tarball. 
+
 -------------------------------------------------------------------
 Mon Jun 18 11:01:29 UTC 2012 - ddiss@suse.com
 
@@ -15,7 +21,8 @@ Fri Jun 15 14:59:26 UTC 2012 - ddiss@suse.com
 -------------------------------------------------------------------
 Wed Jun  6 12:49:13 UTC 2012 - ddiss@suse.com
 
-- Use upstream spec file
+- Use upstream based spec file to support combined SUSE/RH builds;
+  (bnc#732763).
 
 - Update to pcp-3.6.3.
   + Revert initial attempt at getting configure --prefix option to
diff --git a/pcp.spec b/pcp.spec
index 1a366f0..7ae2652 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -61,7 +61,6 @@ Patch10:        pcp_legacy_init_lsb.patch
 Patch11:        fix_configure_path_tests.patch
 Patch12:        configure_append_pcp_subdir.patch
 Patch13:        remove_cpan_rpaths.patch
-Patch14:        fix_cpan_pmda_manifest.patch
 
 %if "%{_vendor}" == "suse"
 Requires:       sysconfig cpp 
@@ -261,7 +260,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 autoconf
 %configure --localstatedir=/var/lib