diff --git a/net/atftp/Makefile b/net/atftp/Makefile
index cabdd3efd3..0d281502ed 100644
--- a/net/atftp/Makefile
+++ b/net/atftp/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=atftp
 PKG_VERSION:=0.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
diff --git a/net/atftp/files/atftpd.conf b/net/atftp/files/atftpd.conf
index 6bd66e94c3..cea135d2e6 100644
--- a/net/atftp/files/atftpd.conf
+++ b/net/atftp/files/atftpd.conf
@@ -1,3 +1,5 @@
 
 config service 'service'
+	option enable '0'
 	option path '/srv/tftp'
+	option port '69'
diff --git a/net/atftp/files/atftpd.init b/net/atftp/files/atftpd.init
index 83573f998e..03627eeb37 100755
--- a/net/atftp/files/atftpd.init
+++ b/net/atftp/files/atftpd.init
@@ -5,11 +5,19 @@ START=95
 PIDFILE=/tmp/run/atftpd.pid
 
 start() {
-	config_load atftpd
-	config_get SRV service path "/srv/tftp"
-	config_get PORT service port 69
+	local enable
+	local srv
+	local port
 
-	atftpd --pidfile $PIDFILE --user root.root --port $PORT --daemon $SRV
+	config_load atftpd
+
+	config_get enable service enable 0
+	[ "$enable" -eq "0" ] && return 0
+
+	config_get srv service path "/srv/tftp"
+	config_get port service port 69
+
+	atftpd --pidfile $PIDFILE --user root.root --port $port --daemon $srv
 }
 
 stop() {