diff --git a/atftp.changes b/atftp.changes
index f0c18cf..6fa7e48 100644
--- a/atftp.changes
+++ b/atftp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 15 13:19:22 UTC 2015 - mpluskal@suse.com
+
+- Use ATFTPD_BIND_ADDRESSES in init script (boo#921219)
+- Move autoreconf back to %buils as it causes issues with quilt
+
 -------------------------------------------------------------------
 Mon Jun  8 07:39:43 UTC 2015 - schwab@suse.de
 
diff --git a/atftp.spec b/atftp.spec
index 21185eb..b18283d 100644
--- a/atftp.spec
+++ b/atftp.spec
@@ -93,9 +93,9 @@ boot of hundreds of machines simultaneously.
 %patch12
 %patch13
 %patch14
-autoreconf -fi
 
 %build
+autoreconf -fi
 CFLAGS="%optflags -fgnu89-inline"
 %configure
 make %{?_smp_mflags}
diff --git a/atftpd.init b/atftpd.init
index 315f7c1..e6f2680 100644
--- a/atftpd.init
+++ b/atftpd.init
@@ -69,7 +69,7 @@ ATFTP_GRP=${ATFTPD_GROUP:="tftp"}
 ATFTP_OPTS=${ATFTPD_OPTIONS:=""}
 ATFTP_USE_INETD=${ATFTPD_USE_INETD:="no"}
 ATFTP_DIR=${ATFTPD_DIRECTORY:="/srv/tftpboot"}
-ATFTP_BIND=${ATFTP_BIND_ADDRESSES:=""}
+ATFTP_BIND=${ATFTPD_BIND_ADDRESSES:=""}
 
 # start as daemon with some default opts 
 ATFTP_DEF_OPTS="--daemon --user $ATFTP_USR --group $ATFTP_GRP --logfile $ATFTP_LOG_FILE"