diff --git a/net/tftp-hpa/Makefile b/net/tftp-hpa/Makefile
index 5b4460370..45f246f57 100644
--- a/net/tftp-hpa/Makefile
+++ b/net/tftp-hpa/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tftp-hpa
 PKG_VERSION:=0.48
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@KERNEL/software/network/tftp
diff --git a/net/tftp-hpa/files/tftpd-hpa.init b/net/tftp-hpa/files/tftpd-hpa.init
index 1b361d932..c3432ede4 100644
--- a/net/tftp-hpa/files/tftpd-hpa.init
+++ b/net/tftp-hpa/files/tftpd-hpa.init
@@ -1,14 +1,13 @@
 #!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=50
 
-RUN_D=/var/tftpd-hpa
-
 start() {
-	[ -d $RUN_D ] || mkdir -p $RUN_D
-	tftpd-hpa -l -s $RUN_D
+	mkdir -m 0755 -p /var/tftpd-hpa
+	service_start /usr/sbin/tftpd-hpa -l -s /var/tftpd-hpa
 }
 
 stop() {
-	killall tftpd-hpa
+	service_stop /usr/sbin/tftpd-hpa
 }