diff --git a/rpcbind-0.1.6+git20080930.tar.bz2 b/rpcbind-0.1.6+git20080930.tar.bz2
deleted file mode 100644
index 788b4eb..0000000
--- a/rpcbind-0.1.6+git20080930.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6f6048fdae3dcdb8f0e0f9662d1d1c608cc134771c5cce4c87fc7e16a215eff
-size 46225
diff --git a/rpcbind-0.2.0_git201007131952.tar.xz b/rpcbind-0.2.0_git201007131952.tar.xz
new file mode 100644
index 0000000..f5a8192
--- /dev/null
+++ b/rpcbind-0.2.0_git201007131952.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8fd59e9cffe668a827828c54ed274a4db0d03dbbf87a749f43dbd315ec7aee2
+size 47040
diff --git a/rpcbind.changes b/rpcbind.changes
index 7f5c7af..09c72c2 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Nov 14 14:00:49 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Use full RELRO here 
+
+-------------------------------------------------------------------
+Tue Oct 26 15:20:07 UTC 2010 - cristian.rodriguez@opensuse.org
+
+-  Update to a newer GIT snapshot
+  * nd: set SO_REUSEADDR on NC_TPI_COTS listening sockets
+  * rpcbind: add no-fork mode  
+
 -------------------------------------------------------------------
 Thu Dec  4 11:02:25 CET 2008 - coolo@suse.de
 
diff --git a/rpcbind.spec b/rpcbind.spec
index a2ea76e..4f3c9f4 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -17,17 +17,19 @@
 
 # norootforbuild
 
-BuildRequires:  libtirpc-devel tcpd-devel
+BuildRequires:  libtirpc-devel 
+BuildRequires:	tcpd-devel
+BuildRequires:	xz
 
 Name:           rpcbind
 License:        BSD 3-Clause
 Group:          Productivity/Networking/System
 AutoReqProv:    on
-Version:        0.1.6+git20080930
+Version:        0.2.0_git201007131952
 Release:        6
 Summary:        Transport independent RPC portmapper
-Url:            http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php
-Source:         %{name}-%{version}.tar.bz2
+Url:            http://git.infradead.org/users/steved/rpcbind.git
+Source:         %{name}-%{version}.tar.xz
 Source1:        rpcbind.init
 Source2:        sysconfig.rpcbind
 Source3:        rpcbind.xml
@@ -53,23 +55,21 @@ Authors:
     Vincent ROQUETA <vincent.roqueta@ext.bull.net>
 
 %prep
-%setup
+%setup -q
 cp %{SOURCE4} .
 
 %build
 autoreconf -fi
-./configure --prefix=%{_prefix} \
+%configure --disable-static --with-pic \
 	    --bindir=/sbin \
-	    --mandir=%{_mandir} \
-	    --localstatedir=%{_localstatedir} \
 	    --enable-libwrap \
 	    --enable-warmstarts \
 	    --with-statedir=%{_localstatedir}/lib/rpcbind \
 	    --enable-debug \
 	    CFLAGS="$RPM_OPT_FLAGS -fpie" \
-	    LDFLAGS="-pie"
-make
-gcc -o pmap_set $RPM_OPT_FLAGS pmap_set.c
+	    LDFLAGS="-pie -Wl,-z,relro,-z,now"
+%{__make} %{?jobs:-j%jobs}
+cc -Wl,-z,relro,-z,now %{optflags} pmap_set.c -o pmap_set
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 # upgrade case from portmap
 # 1. if portmap is running, dump portmap tables
-if /sbin/checkproc /sbin/portmap; then
+if test -x /sbin/portmap && /sbin/checkproc /sbin/portmap; then
 	rm -f %statefile
 	test -x /sbin/pmap_dump && /sbin/pmap_dump > %statefile
 fi
@@ -126,7 +126,7 @@ fi
 /sbin/pmap_set2
 /sbin/rpcbind
 /sbin/rpcinfo
-%doc %{_mandir}/*/*
+%{_mandir}/*/*
 %config /etc/init.d/rpcbind
 /sbin/rcrpcbind
 %{_localstatedir}/lib/rpcbind