diff -ur pcp-2.5.0/configure.in pcp-2.5.0.SuSE/configure.in
--- pcp-2.5.0/configure.in	2005-11-29 02:39:26.000000000 +0100
+++ pcp-2.5.0.SuSE/configure.in	2006-01-16 16:22:45.462489138 +0100
@@ -1215,11 +1215,6 @@
 		break
 	    fi
 	done
-	if test -x /usr/lib/rpm/brp-compress
-	then
-	    have_gzipped_manpages=true
-	    have_bzip2ed_manpages=false
-	fi
     fi
 else
    pcp_man_dir=`eval echo $mandir`
@@ -1229,6 +1224,11 @@
     echo "FATAL ERROR: could not find find pcp_man_dir directory."
     exit 1
 fi
+if test -x /usr/lib/rpm/brp-compress
+then
+    have_gzipped_manpages=true
+    have_bzip2ed_manpages=false
+fi
 AC_SUBST(pcp_man_dir)
 AC_SUBST(have_gzipped_manpages)
 AC_SUBST(have_bzip2ed_manpages)
@@ -1324,6 +1324,9 @@
    if test $target_os = irix
    then
        pcp_doc_dir=/usr/pcp/doc
+   elif test -x /sbin/SuSEconfig
+   then
+       pcp_doc_dir=/usr/share/doc/packages/pcp
    else
        if test -d /usr/share/doc/packages
        then
@@ -1349,6 +1352,9 @@
    if test $target_os = irix
    then
        pcp_demos_dir=/var/pcp/demos
+   elif test -x /sbin/SuSEconfig
+   then
+       pcp_demos_dir=/var/lib/pcp/demos
    else
        if test -d /usr/share/demos
        then
diff -ur pcp-2.5.0/src/pmdas/cisco/GNUmakefile pcp-2.5.0.SuSE/src/pmdas/cisco/GNUmakefile
--- pcp-2.5.0/src/pmdas/cisco/GNUmakefile	2005-11-29 02:52:32.000000000 +0100
+++ pcp-2.5.0.SuSE/src/pmdas/cisco/GNUmakefile	2006-01-16 12:46:38.444340290 +0100
@@ -49,6 +49,7 @@
 
 install:	default
 	$(INSTALL) -m 755 -d $(PMDADIR)
+	$(INSTALL) -m 755 -d $(PMIE)
 	$(INSTALL) -m 755 $(IAM) $(PMDADIR)/pmda$(IAM) 
 	$(INSTALL) -m 755 probe parse Install Remove $(PMDADIR)
 	$(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR)
diff -ur pcp-2.5.0/src/pmdas/shping/GNUmakefile pcp-2.5.0.SuSE/src/pmdas/shping/GNUmakefile
--- pcp-2.5.0/src/pmdas/shping/GNUmakefile	2005-11-29 02:53:55.000000000 +0100
+++ pcp-2.5.0.SuSE/src/pmdas/shping/GNUmakefile	2006-01-16 12:47:12.428062067 +0100
@@ -49,6 +49,7 @@
 
 install:	default
 	$(INSTALL) -m 755 -d $(PMDADIR)
+	$(INSTALL) -m 755 -d $(PMIE)
 	$(INSTALL) -m 755 $(IAM) $(PMDADIR)/pmda$(IAM) 
 	$(INSTALL) -m 755 Install Remove $(PMDADIR)
 	$(INSTALL) -m 644 GNUmakefile.install $(PMDADIR)/Makefile
diff -ur pcp-2.5.0/src/pmpost/GNUmakefile pcp-2.5.0.SuSE/src/pmpost/GNUmakefile
--- pcp-2.5.0/src/pmpost/GNUmakefile	2005-11-29 02:47:22.000000000 +0100
+++ pcp-2.5.0.SuSE/src/pmpost/GNUmakefile	2006-01-13 13:55:30.200846770 +0100
@@ -34,7 +34,7 @@
 include $(BUILDRULES)
 
 install:	default
-	$(INSTALL) -m 4755 -o root $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET)
+	$(INSTALL) -m 4750 -o root -g trusted $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET)
 
 default_pcp:	default
 
--- pcp-2.5.0-51/src/libpcp/src/connect.c	2005-11-29 02:40:20.000000000 +0100
+++ pcp-2.5.0/src/libpcp/src/connect.c	2007-07-12 15:42:43.000000000 +0200
@@ -253,7 +253,7 @@
 __pmConnectPMCD(const char *hostname)
 {
     __pmIPC	ipcinfo = { UNKNOWN_VERSION, NULL };
-    int		sts;
+    int		sts = -1;
     int		fd;	/* Fd for socket connection to pmcd */
     int		port;
     int		i;