diff --git a/aur/netatalk/PKGBUILD b/aur/netatalk/PKGBUILD
index 8935c7f88..41f03825f 100644
--- a/aur/netatalk/PKGBUILD
+++ b/aur/netatalk/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=3
 pkgdesc='A kernel-level implementation of AFP services'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -17,19 +17,19 @@ backup=('etc/afp.conf')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(netatalk.rc http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
-	'62eb034011bb60b0bfd95072af3693dc')
+source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+md5sums=('b4f5c932b2ca99f5292bd6b6d69b3ebc')
 
 build() {
 	cd $pkgname-$pkgver
 	msg2 'Fixing...'
 	sed -i 's/x"linux/x"generic/' macros/netatalk.m4
+	sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in}
 	autoreconf &>/dev/null
-	echo -e "all:\ninstall:">libevent/Makefile
 	msg2 'Configuring...'
-	CFLAGS="-Wno-unused-result" LIBS=-levent ./configure --prefix=/usr --localstatedir=/etc --sysconfdir=/etc \
-		--disable-bundled-libevent --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-init-style=systemd
+	CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \
+		--with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --without-libevent-header --without-libevent-lib
+	sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile
 	msg2 'Making...'
 	make >/dev/null
 }
@@ -37,6 +37,4 @@ package() {
 	cd $pkgname-$pkgver
 	msg2 'Building...'
 	make DESTDIR="$pkgdir" install >/dev/null
-	msg2 'Copying initscripts...'
-	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
 }
diff --git a/aur/netatalk/netatalk.changelog b/aur/netatalk/netatalk.changelog
index b577562d4..b1ada018b 100644
--- a/aur/netatalk/netatalk.changelog
+++ b/aur/netatalk/netatalk.changelog
@@ -1,3 +1,21 @@
+2012-10-08 SJ_UnderWater
+
+	* 3.0.1-3 :
+	moved systemd from /etc
+	better rc.d install test
+
+2012-10-05 SJ_UnderWater
+
+	* 3.0.1-2 :
+	removed rc.d references
+
+2012-10-04 SJ_UnderWater
+
+	* 3.0.1-1 :
+	new version
+	moved to systemd
+	moved state to /var/db
+
 2012-07-14 SJ_UnderWater
 
 	* 3.0-3 :
diff --git a/aur/netatalk/netatalk.install b/aur/netatalk/netatalk.install
index a385add10..629586531 100644
--- a/aur/netatalk/netatalk.install
+++ b/aur/netatalk/netatalk.install
@@ -2,11 +2,11 @@ post_install() {
 	post_upgrade
 }
 post_upgrade() {
-	if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
+	if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then
 	echo '>>> Detected old netatalk daemon entries in';
 	echo '>>> /etc/rc.conf, please replace these with';
 	echo '>>> "netatalk" before restarting!';
-	else echo '>>> Add "netatalk" to your DAEMONS list in /etc/rc.conf';fi
+	else echo '>>> Add "netatalk" to your DAEMONS list';fi
 	echo '>>>';
 	if [ -f /etc/avahi/services/adisk.service ] ||
 	[ -f /etc/avahi/services/afpd.service ];then
@@ -18,6 +18,3 @@ post_upgrade() {
 	echo '>>> Found *.conf in /opt/netatalk, please';
 	echo '>>> migrate these to /etc/netatalk before restarting';fi
 }
-pre_remove() {
-	rc.d stop netatalk
-}