diff --git a/rpcbind.changes b/rpcbind.changes
index fe39610..db3a0a9 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  2 00:29:16 CET 2008 - ro@suse.de
+
+- rename installed pmap_set to pmap_set2 to avoid conflict
+  with portmap 
+
 -------------------------------------------------------------------
 Mon Dec  1 12:29:50 CET 2008 - mkoenig@suse.de
 
diff --git a/rpcbind.spec b/rpcbind.spec
index fb65bc6..3efde38 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -24,7 +24,7 @@ License:        BSD 3-Clause
 Group:          Productivity/Networking/System
 AutoReqProv:    on
 Version:        0.1.6+git20080930
-Release:        4
+Release:        5
 Summary:        Transport independent RPC portmapper
 Url:            http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php
 Source:         %{name}-%{version}.tar.bz2
@@ -85,7 +85,7 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/
 mkdir -p $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%_datadir/omc/svcinfo.d/
 #
-install -m 755 pmap_set $RPM_BUILD_ROOT/sbin/pmap_set
+install -m 755 pmap_set $RPM_BUILD_ROOT/sbin/pmap_set2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -112,7 +112,7 @@ fi
 if test -r %statefile; then
 	/etc/init.d/portmap stop > /dev/null || :
 	/etc/init.d/rpcbind start > /dev/null || :
-	/sbin/pmap_set < %statefile
+	/sbin/pmap_set2 < %statefile
 	rm -f %statefile
 fi
 
@@ -123,7 +123,7 @@ fi
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README
-/sbin/pmap_set
+/sbin/pmap_set2
 /sbin/rpcbind
 /sbin/rpcinfo
 %doc %{_mandir}/*/*
@@ -134,6 +134,9 @@ fi
 %{_datadir}/omc/svcinfo.d/rpcbind.xml
 
 %changelog
+* Tue Dec 02 2008 ro@suse.de
+- rename installed pmap_set to pmap_set2 to avoid conflict
+  with portmap
 * Mon Dec 01 2008 mkoenig@suse.de
 - if upgrading from portmap:
   * we need to stop portmap and start rpcbind in %%post since the