Merge branch 'dhcpd' into next

diff --combined make.sh
index e5d62533d2041fa56712ea2cb9adccac388b9b55,cd77ce031ad809fb78fec171cc867b2b57f7cf60..576e9970fbfe63e2919e35bf61def997bbe064e4
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.11"                                                        # Version number
  CORE="62"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="61"                                             # Core Level (PAKFIRE)
 +PAKFIRE_CORE="62"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -373,6 -373,7 +373,7 @@@ buildipfire() 
    export LOGFILE
    ipfiremake configroot
    ipfiremake backup
+   ipfiremake bind
    ipfiremake dhcp
    ipfiremake dhcpcd
    ipfiremake libusb
@@@ -513,7 -514,6 +514,6 @@@
    ipfiremake apache2                  PASS=C
    ipfiremake arping
    ipfiremake beep
-   ipfiremake bind
    ipfiremake dvdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
@@@ -771,7 -771,6 +771,7 @@@
    ipfiremake tcpick
    ipfiremake minidlna
    ipfiremake fping
 +  ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild