diff --git a/librpcsecgss/PKGBUILD b/librpcsecgss/PKGBUILD
index 8d2426e38..da6315e29 100644
--- a/librpcsecgss/PKGBUILD
+++ b/librpcsecgss/PKGBUILD
@@ -1,14 +1,13 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=librpcsecgss
 pkgver=0.19
-pkgrel=7
+pkgrel=8
 pkgdesc="Library for RPCSECGSS support"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license=('GPL')
 depends=('glibc' 'krb5' 'libgssglue')
diff --git a/libtirpc/PKGBUILD b/libtirpc/PKGBUILD
index bed949987..5b87aff50 100644
--- a/libtirpc/PKGBUILD
+++ b/libtirpc/PKGBUILD
@@ -1,23 +1,22 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=libtirpc
 pkgver=0.2.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://libtirpc.sourceforge.net/"
 license=('BSD')
 depends=('libgssglue')
 backup=('etc/netconfig')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
-       libtirpc-0.2.1-fortify.patch
-       libtirpc-0.2.3rc1.patch
-       libtirpc-fix-segfault-0.2.2.patch)
+source=("http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2"
+        'libtirpc-0.2.1-fortify.patch'
+        'libtirpc-0.2.3rc1.patch'
+        'libtirpc-fix-segfault-0.2.2.patch')
 md5sums=('74c41c15c2909f7d11d9c7bfa7db6273'
          '2e5c067f1651469dfbbdc91d3c9c60e8'
          'ac2a1657b44f4a99c37d8265b05b9133'
@@ -25,12 +24,11 @@ md5sums=('74c41c15c2909f7d11d9c7bfa7db6273'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix http://bugs.gentoo.org/293593
-  # https://bugs.archlinux.org/task/20082
-  patch -Np1 -i ../libtirpc-0.2.1-fortify.patch
-  # add patches from fedora git to make nfs-utils compile again
-  patch -Np1 -i ../libtirpc-0.2.3rc1.patch
-  patch -Np1 -i ../libtirpc-fix-segfault-0.2.2.patch
+  # from http://bugs.gentoo.org/293593
+  patch -p1 -i ../libtirpc-0.2.1-fortify.patch
+  # patches from fedora git for nfs-utils 
+  patch -p1 -i ../libtirpc-0.2.3rc1.patch
+  patch -p1 -i ../libtirpc-fix-segfault-0.2.2.patch
   sh autogen.sh
   autoreconf -fisv
   ./configure --prefix=/usr --enable-gss
@@ -39,6 +37,7 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
   make DESTDIR="${pkgdir}" install
   install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig
   install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/rpcbind/PKGBUILD b/rpcbind/PKGBUILD
index ae1c6235a..fd2a81973 100644
--- a/rpcbind/PKGBUILD
+++ b/rpcbind/PKGBUILD
@@ -1,37 +1,36 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686):   Samir Benmendil <ram-z[at]chakra-project[dot]org>
-# maintainer (x86_64): Samir Benmendil <ram-z[at]chakra-project[dot]org>
+# maintainer Samir Benmendil <ram-z[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=rpcbind
 pkgver=0.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="portmap replacement which supports RPC over various protocols"
-arch=(i686 x86_64)
+arch=('x86_64')
 depends=('bash' 'glibc' 'libtirpc')
 url="http://rpcbind.sourceforge.net"
 license=('custom')
-source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 
-        rpcbind
-	rpcbind-sunrpc.patch
-	rpcbind.service)
+source=("http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2" 
+	'rpcbind-sunrpc.patch'
+	'rpcbind.service')
 md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
-         '78a963654f57cbb209e228884767836e'
          'c02ac36a98baac70b8a26190524b7b73'
-         'd2615f4c0d58f154aab6e294997ac9be')
+         'a7b23a32be2eb52d7dec52da36d4eba1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  
   patch -p1 -i ../rpcbind-sunrpc.patch
+  
   ./configure --prefix=/usr
   make 
 }
 package() {
   cd $srcdir/$pkgname-$pkgver
+  
   make DESTDIR=$pkgdir install
-  # install daemon 
-  install -D -m755 $srcdir/rpcbind $pkgdir/etc/rc.d/rpcbind
   # install systemd service file
   install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
   # install license
diff --git a/rpcbind/rpcbind b/rpcbind/rpcbind
deleted file mode 100755
index 87c5b50da..000000000
--- a/rpcbind/rpcbind
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$(pidof -o %PPID /usr/bin/rpcbind)"
-case "$1" in
-  start)
-    stat_busy "Starting rpcbind"
-    [ -z "$PID" ] && /usr/bin/rpcbind &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/rpcbind)
-      echo $PID > /var/run/rpcbind.pid
-      add_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping rpcbind"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/rpcbind.pid
-      rm_daemon rpcbind
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/rpcbind/rpcbind.service b/rpcbind/rpcbind.service
index 418ba1e05..3bc764efc 100644
--- a/rpcbind/rpcbind.service
+++ b/rpcbind/rpcbind.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=RPC Bind
-Requires=network.target
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
 
 [Service]
 Type=forking