diff --git a/pcp-rpmlintrc b/pcp-rpmlintrc
new file mode 100644
index 0000000..89ea5d1
--- /dev/null
+++ b/pcp-rpmlintrc
@@ -0,0 +1,5 @@
+# Note: there are some headers (e.g. domain.h) and in a few cases some
+# C source files that rpmlint complains about. These are not devel files,
+# but rather they are (slightly obscure) PMDA config files.
+#
+addFilter('E: devel-file-in-non-devel-package')
diff --git a/pcp.changes b/pcp.changes
index 2844987..8cc40d5 100644
--- a/pcp.changes
+++ b/pcp.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jul 30 11:54:34 UTC 2012 - ddiss@suse.com
+
+- use addFilter for rpmlintrc, setBadness is not acceptable for Factory.
+
+-------------------------------------------------------------------
+Thu Jul 19 15:28:03 UTC 2012 - ddiss@suse.com
+
+- Spec file cleanups following feedback from Sascha.
+  + Do not remove the buildroot as part of %install
+  + Use %suse_version rather than %_vendor
+  + Add pcp-rpmlintrc script for devel-file-in-non-devel-package errors
+  + Remove runlevel 4 references from init scripts
+  + Add explicit perl version Requires
+
 -------------------------------------------------------------------
 Wed Jun 27 10:36:49 UTC 2012 - ddiss@suse.com
 
diff --git a/pcp.spec b/pcp.spec
index 7ae2652..6d2b135 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -23,7 +23,7 @@ Version:        3.6.4
 Release:        1
 %define buildversion 1
 
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %define pcp_gr			System/Monitoring
 %define lib_pkg			libpcp3
 %define lib_pkg_conflict	pcp-libs
@@ -34,6 +34,7 @@ Release:        1
 %define license_gplv2		GPL-2.0
 %define license_lgplv2		LGPL-2.0
 %define license_lgplv2plus	LGPL-2.1+
+%define perl_version		%(perl -V:version | sed "s!.*='!!;s!'.*!!")
 %else
 %define pcp_gr			Applications/System
 %define lib_pkg			pcp-libs
@@ -51,6 +52,7 @@ License:        %{license_gplv2}
 Url:            http://oss.sgi.com/projects/pcp
 Group:          %{pcp_gr}
 Source0:        ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz
+Source1:        pcp-rpmlintrc
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf bison flex ncurses-devel procps readline-devel
@@ -61,8 +63,9 @@ Patch10:        pcp_legacy_init_lsb.patch
 Patch11:        fix_configure_path_tests.patch
 Patch12:        configure_append_pcp_subdir.patch
 Patch13:        remove_cpan_rpaths.patch
+Patch14:        rm_init_script_runlevel_4.patch
 
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 Requires:       sysconfig cpp 
 %else
 Requires:       initscripts
@@ -125,8 +128,8 @@ Group:          %{pcp_gr}
 Summary:        Performance Co-Pilot (PCP) Perl bindings and documentation
 Url:            http://oss.sgi.com/projects/pcp/
 Requires:       pcp >= %{version}
-%if "%{_vendor}" == "suse"
-Requires:       perl-base
+%if (0%{?suse_version} > 0)
+Requires:       perl = %{perl_version}
 %endif
 
 %description -n perl-PCP-PMDA
@@ -145,8 +148,8 @@ Group:          %{pcp_gr}
 Summary:        Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values
 Url:            http://oss.sgi.com/projects/pcp/
 Requires:       pcp >= %{version}
-%if "%{_vendor}" == "suse"
-Requires:       perl-base
+%if (0%{?suse_version} > 0)
+Requires:       perl = %{perl_version}
 %endif
 
 %description -n perl-PCP-MMV
@@ -166,8 +169,8 @@ Group:          %{pcp_gr}
 Summary:        Performance Co-Pilot Perl bindings for importing external archive data
 Url:            http://oss.sgi.com/projects/pcp/
 Requires:       pcp >= %{version}
-%if "%{_vendor}" == "suse"
-Requires:       perl-base
+%if (0%{?suse_version} > 0)
+Requires:       perl = %{perl_version}
 %endif
 
 %description -n perl-PCP-LogImport
@@ -184,8 +187,8 @@ Group:          %{pcp_gr}
 Summary:        Performance Co-Pilot Perl bindings for processing pmlogsummary output
 Url:            http://oss.sgi.com/projects/pcp/
 Requires:       pcp >= %{version}
-%if "%{_vendor}" == "suse"
-Requires:       perl-base
+%if (0%{?suse_version} > 0)
+Requires:       perl = %{perl_version}
 %endif
 
 %description -n perl-PCP-LogSummary
@@ -260,6 +263,7 @@ 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
 
@@ -270,7 +274,6 @@ rm -Rf $RPM_BUILD_ROOT
 make default_pcp
 
 %install
-rm -Rf $RPM_BUILD_ROOT
 export DIST_ROOT=$RPM_BUILD_ROOT
 make install_pcp
 
@@ -278,7 +281,7 @@ make install_pcp
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp
 
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 # add /etc/init.d/X symlinks at /usr/sbin/rcX
 %__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir}
 for script in pcp pmie pmproxy pmlogger pmcd; do
@@ -305,7 +308,7 @@ sed -e 's#$#*#'  >base_man1files.list
 
 cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.list
 
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 
 %preun
 %{?stop_on_removal:%{stop_on_removal pmlogger pmie pmproxy pmcd}}
@@ -364,7 +367,7 @@ fi
 %defattr(-,root,root)
 # pcp_doc_dir should be derived from a configure option, currently it's not
 %{_datadir}/doc/packages/pcp-%{version}
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %{_sbindir}/rc*
 %endif
 
@@ -458,7 +461,7 @@ fi
 
 %files -n perl-PCP-PMDA -f perl-pcp-pmda.list
 %defattr(-,root,root)
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA
@@ -466,7 +469,7 @@ fi
 
 %files -n perl-PCP-MMV -f perl-pcp-mmv.list
 %defattr(-,root,root)
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV
@@ -474,7 +477,7 @@ fi
 
 %files -n perl-PCP-LogImport -f perl-pcp-logimport.list
 %defattr(-,root,root)
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP
 %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport
@@ -482,7 +485,7 @@ fi
 
 %files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list
 %defattr(-,root,root)
-%if "%{_vendor}" == "suse"
+%if (0%{?suse_version} > 0)
 %dir %{_prefix}/lib/perl5/vendor_perl/*/PCP
 %endif
 
diff --git a/rm_init_script_runlevel_4.patch b/rm_init_script_runlevel_4.patch
new file mode 100644
index 0000000..e531050
--- /dev/null
+++ b/rm_init_script_runlevel_4.patch
@@ -0,0 +1,65 @@
+Index: pcp-3.6.4/src/pmcd/rc_pcp
+===================================================================
+--- pcp-3.6.4.orig/src/pmcd/rc_pcp
++++ pcp-3.6.4/src/pmcd/rc_pcp
+@@ -35,7 +35,7 @@
+ # Should-Start:      $network $remote_fs $syslog $time
+ # Required-Stop:     $local_fs
+ # Should-Stop:       $network $remote_fs $syslog
+-# Default-Start:     2 3 4 5
++# Default-Start:     2 3 5
+ # Default-Stop:      0 1 6
+ # Short-Description: Legacy control for PCP daemons
+ # Description:       Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons
+Index: pcp-3.6.4/src/pmcd/rc_pmcd
+===================================================================
+--- pcp-3.6.4.orig/src/pmcd/rc_pmcd
++++ pcp-3.6.4/src/pmcd/rc_pmcd
+@@ -30,7 +30,7 @@
+ # Should-Start:      $network $remote_fs $syslog $time
+ # Required-Stop:     $local_fs
+ # Should-Stop:       $network $remote_fs $syslog
+-# Default-Start:     2 3 4 5
++# Default-Start:     2 3 5
+ # Default-Stop:      0 1 6
+ # Short-Description: Control pmcd (the collection daemon for PCP)
+ # Description:       Configure and control pmcd (the collection daemon for the Performance Co-Pilot)
+Index: pcp-3.6.4/src/pmie/rc_pmie
+===================================================================
+--- pcp-3.6.4.orig/src/pmie/rc_pmie
++++ pcp-3.6.4/src/pmie/rc_pmie
+@@ -24,7 +24,7 @@
+ # Should-Start: $local_fs $network $syslog $time $pmcd
+ # Required-Stop: $remote_fs
+ # Should-Stop:  $local_fs $network $syslog $pmcd
+-# Default-Start:  2 3 4 5
++# Default-Start:  2 3 5
+ # Default-Stop:   0 1 6
+ # Short-Description: Control pmie (performance inference engine for PCP)
+ # Description:       Configure and control pmie (the performance inference engine for the Performance Co-Pilot)
+Index: pcp-3.6.4/src/pmlogger/rc_pmlogger
+===================================================================
+--- pcp-3.6.4.orig/src/pmlogger/rc_pmlogger
++++ pcp-3.6.4/src/pmlogger/rc_pmlogger
+@@ -30,7 +30,7 @@
+ # Should-Start:      $network $remote_fs $syslog $time $pmcd
+ # Required-Stop:     $local_fs
+ # Should-Stop:       $network $remote_fs $syslog $pmcd
+-# Default-Start:     2 3 4 5
++# Default-Start:     2 3 5
+ # Default-Stop:      0 1 6
+ # Short-Description: Control pmlogger (the performance metrics logger for PCP)
+ # Description:       Configure and control pmlogger (the performance metrics logger for the Performance Co-Pilot)
+Index: pcp-3.6.4/src/pmproxy/rc_pmproxy
+===================================================================
+--- pcp-3.6.4.orig/src/pmproxy/rc_pmproxy
++++ pcp-3.6.4/src/pmproxy/rc_pmproxy
+@@ -30,7 +30,7 @@
+ # Should-Start: $local_fs $network $syslog $time $pmcd
+ # Required-Stop: $remote_fs
+ # Should-Stop:  $local_fs $network $syslog $pmcd
+-# Default-Start:  2 3 4 5
++# Default-Start:  2 3 5
+ # Default-Stop:   0 1 6
+ # Short-Description: Control pmproxy (the pmcd proxy daemon for PCP)
+ # Description:       Configure and control pmproxy (the pmcd proxy daemon for the Performance Co-Pilot)