Merge branch 'bird' into next

diff --combined make.sh
index 8392e30333e417833f45b22713768712c0ff9b56,3a2c8d311875568bb9c7a3f4a7bbcf094f1d12f3..a612afca2227b0a9485761f731bdfc7e668dd7e0
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.17"                                                        # Version number
 -CORE="98"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="97"                                             # Core Level (PAKFIRE)
 +CORE="100"                                                    # Core Level (Filename)
 +PAKFIRE_CORE="99"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -848,6 -848,7 +848,7 @@@ buildipfire() 
    ipfiremake ipset
    ipfiremake lua
    ipfiremake dnsdist
+   ipfiremake bird
  }
  
  buildinstaller() {