diff --git a/Dockerfile b/Dockerfile
index 6bae4bd..d459e6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,15 +14,15 @@ ENV SRC_DIR=/build \
     BR_ROOT=/build/buildroot
 RUN mkdir -p ${SRC_DIR} ${OVERLAY}
 
-ENV BR_VERSION 2016.02
+ENV BR_VERSION 2016.05
 RUN wget -qO- https://buildroot.org/downloads/buildroot-${BR_VERSION}.tar.bz2 | tar xj && \
     mv buildroot-${BR_VERSION} ${BR_ROOT}
 
 # Apply patches
-COPY patches ${SRC_DIR}/patches
-RUN for patch in ${SRC_DIR}/patches/*.patch; do \
-      patch -p1 -d ${BR_ROOT} < ${patch}; \
-    done
+# COPY patches ${SRC_DIR}/patches
+# RUN for patch in ${SRC_DIR}/patches/*.patch; do \
+#       patch -p1 -d ${BR_ROOT} < ${patch}; \
+#     done
 
 # Setup overlay
 COPY overlay ${OVERLAY}
@@ -50,7 +50,7 @@ RUN mkdir -p usr/bin && \
     wget -qO usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DINIT_VERSION}/dumb-init_${DINIT_VERSION}_amd64 && \
     chmod +x usr/bin/dumb-init
 
-ENV VERSION 2.0.3
+ENV VERSION 2.1.0
 RUN mkdir -p etc && \
     echo "Welcome to Barge ${VERSION}, $(usr/bin/docker -v)" > etc/motd && \
     echo "NAME=\"Barge\"" > etc/os-release && \
diff --git a/Makefile b/Makefile
index cc48a16..2045a76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 KERNEL_VERSION  := 4.4.11
-BUSYBOX_VERSION := 1.24.1
+BUSYBOX_VERSION := 1.24.2
 
 OUTPUTS := output/rootfs.tar.xz output/bzImage output/barge.iso output/barge.img
 SOURCES := Dockerfile .dockerignore \
diff --git a/README.md b/README.md
index eb9bd14..dea252f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Barge 2.0
 
-Barge is a lightweight Linux distribution for containers made with [Buildroot](http://buildroot.uclibc.org/).
+Barge is a lightweight Linux distribution built with [Buildroot](http://buildroot.uclibc.org/) specifically to run [Docker](https://www.docker.com/) containers.
 
 It's designed for a local development in a virtual machine.
 
@@ -14,7 +14,7 @@ It's inspired by the following projects.
 
 ## Features
 
-- Based on Buildroot 2016.02 with Linux kernel v4.4.11 and GLIBC.
+- Built with Buildroot 2016.05 with Linux kernel v4.4.11 and glibc.
 - Strip down the Linux kernel modules and drivers
 - Busybox + the following utilities from Buildroot
 	- sudo, bash, wget, xz, sntp, logrotate
diff --git a/configs/buildroot.config b/configs/buildroot.config
index af85112..762ab36 100644
--- a/configs/buildroot.config
+++ b/configs/buildroot.config
@@ -1,8 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2016.02 Configuration
+# Buildroot 2016.05 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
+BR2_HOST_GCC_AT_LEAST_4_6=y
 BR2_HOST_GCC_AT_LEAST_4_7=y
 BR2_HOST_GCC_AT_LEAST_4_8=y
 
@@ -19,6 +20,7 @@ BR2_ARCH_HAS_MMU_MANDATORY=y
 # BR2_aarch64_be is not set
 # BR2_bfin is not set
 # BR2_i386 is not set
+# BR2_m68k is not set
 # BR2_microblazeel is not set
 # BR2_microblazebe is not set
 # BR2_mips is not set
@@ -139,9 +141,10 @@ BR2_KERNEL_HEADERS_AS_KERNEL=y
 # BR2_KERNEL_HEADERS_3_14 is not set
 # BR2_KERNEL_HEADERS_3_18 is not set
 # BR2_KERNEL_HEADERS_4_1 is not set
-# BR2_KERNEL_HEADERS_4_3 is not set
 # BR2_KERNEL_HEADERS_4_4 is not set
+# BR2_KERNEL_HEADERS_4_5 is not set
 # BR2_KERNEL_HEADERS_VERSION is not set
+# BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5 is not set
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3 is not set
 # BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2 is not set
@@ -174,17 +177,18 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
 BR2_PACKAGE_LINUX_HEADERS=y
 BR2_PACKAGE_GLIBC=y
-BR2_GLIBC_VERSION_2_21=y
-# BR2_GLIBC_VERSION_2_22 is not set
-BR2_GLIBC_VERSION_STRING="2.21"
+BR2_GLIBC_VERSION_2_22=y
+# BR2_GLIBC_VERSION_2_23 is not set
+BR2_GLIBC_VERSION_STRING="2.22"
 
 #
 # Binutils Options
 #
 # BR2_BINUTILS_VERSION_2_23_X is not set
-BR2_BINUTILS_VERSION_2_24_X=y
-# BR2_BINUTILS_VERSION_2_25_X is not set
-BR2_BINUTILS_VERSION="2.24"
+# BR2_BINUTILS_VERSION_2_24_X is not set
+BR2_BINUTILS_VERSION_2_25_X=y
+# BR2_BINUTILS_VERSION_2_26_X is not set
+BR2_BINUTILS_VERSION="2.25.1"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
 
 #
@@ -192,10 +196,10 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
 #
 BR2_GCC_NEEDS_MPC=y
 BR2_GCC_SUPPORTS_GRAPHITE=y
-# BR2_GCC_VERSION_4_7_X is not set
 # BR2_GCC_VERSION_4_8_X is not set
 BR2_GCC_VERSION_4_9_X=y
 # BR2_GCC_VERSION_5_X is not set
+# BR2_GCC_VERSION_6_X is not set
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
 BR2_GCC_VERSION="4.9.3"
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -260,6 +264,7 @@ BR2_TOOLCHAIN_HAS_SYNC_1=y
 BR2_TOOLCHAIN_HAS_SYNC_2=y
 BR2_TOOLCHAIN_HAS_SYNC_4=y
 BR2_TOOLCHAIN_HAS_SYNC_8=y
+BR2_TOOLCHAIN_HAS_LIBATOMIC=y
 BR2_TOOLCHAIN_HAS_ATOMIC=y
 
 #
@@ -312,6 +317,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 # BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
 # BR2_LINUX_KERNEL_CUSTOM_GIT is not set
 # BR2_LINUX_KERNEL_CUSTOM_HG is not set
+# BR2_LINUX_KERNEL_CUSTOM_SVN is not set
 # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.11"
 BR2_LINUX_KERNEL_VERSION="4.4.11"
@@ -343,6 +349,7 @@ BR2_LINUX_KERNEL_XZ=y
 #
 # BR2_LINUX_KERNEL_TOOL_CPUPOWER is not set
 # BR2_LINUX_KERNEL_TOOL_PERF is not set
+# BR2_LINUX_KERNEL_TOOL_SELFTESTS is not set
 
 #
 # Target packages
@@ -375,9 +382,11 @@ BR2_PACKAGE_SKELETON=y
 # espeak needs a toolchain w/ C++, wchar, threads, dynamic library
 #
 # BR2_PACKAGE_FAAD2 is not set
+BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS=y
 # BR2_PACKAGE_FFMPEG is not set
 # BR2_PACKAGE_FLAC is not set
 # BR2_PACKAGE_FLITE is not set
+# BR2_PACKAGE_GMRENDER_RESURRECT is not set
 # BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_GSTREAMER1 is not set
 
@@ -387,7 +396,7 @@ BR2_PACKAGE_SKELETON=y
 BR2_PACKAGE_KODI_ARCH_SUPPORTS=y
 
 #
-# kodi needs a toolchain w/ C++, threads, wchar, dynamic library
+# kodi needs a uClibc or (e)glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6
 #
 
 #
@@ -415,6 +424,8 @@ BR2_PACKAGE_KODI_ARCH_SUPPORTS=y
 # BR2_PACKAGE_MPG123 is not set
 BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
 # BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_MPV is not set
+# BR2_PACKAGE_MULTICAT is not set
 # BR2_PACKAGE_MUSEPACK is not set
 # BR2_PACKAGE_NCMPC is not set
 # BR2_PACKAGE_OPUS_TOOLS is not set
@@ -480,6 +491,7 @@ BR2_PACKAGE_XZ=y
 # BR2_PACKAGE_DMALLOC is not set
 # BR2_PACKAGE_DROPWATCH is not set
 # BR2_PACKAGE_DSTAT is not set
+# BR2_PACKAGE_DT is not set
 
 #
 # duma needs a toolchain w/ C++, threads, dynamic library
@@ -645,6 +657,7 @@ BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
 # BR2_PACKAGE_BITSTREAM_VERA is not set
 # BR2_PACKAGE_CANTARELL is not set
 # BR2_PACKAGE_DEJAVU is not set
+# BR2_PACKAGE_FONT_AWESOME is not set
 # BR2_PACKAGE_GHOSTSCRIPT_FONTS is not set
 # BR2_PACKAGE_INCONSOLATA is not set
 # BR2_PACKAGE_LIBERATION is not set
@@ -695,10 +708,6 @@ BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
 #
 # glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d
 #
-
-#
-# glmark2 needs udev /dev management and a toolchain w/ C++, NPTL
-#
 # BR2_PACKAGE_GNUPLOT is not set
 # BR2_PACKAGE_JHEAD is not set
 # BR2_PACKAGE_RRDTOOL is not set
@@ -772,7 +781,7 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
 #
 
 #
-# midori needs libgtk2 and a toolchain w/ C++, wchar, NPTL, gcc >= 4.8
+# midori needs libgtk3 and an (e)glibc toolchain w/ C++, gcc >= 4.9
 #
 
 #
@@ -798,8 +807,10 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
 # BR2_PACKAGE_B43_FIRMWARE is not set
 # BR2_PACKAGE_LINUX_FIRMWARE is not set
 # BR2_PACKAGE_UX500_FIRMWARE is not set
+# BR2_PACKAGE_WILC1000_FIRMWARE is not set
 # BR2_PACKAGE_ZD1211_FIRMWARE is not set
 BR2_PACKAGE_ACPID=y
+# BR2_PACKAGE_AER_INJECT is not set
 # BR2_PACKAGE_AVRDUDE is not set
 
 #
@@ -845,6 +856,7 @@ BR2_PACKAGE_ACPID=y
 # BR2_PACKAGE_HWDATA is not set
 # BR2_PACKAGE_HWLOC is not set
 # BR2_PACKAGE_I2C_TOOLS is not set
+# BR2_PACKAGE_I7Z is not set
 # BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
 # BR2_PACKAGE_INPUT_TOOLS is not set
 # BR2_PACKAGE_INTEL_MICROCODE is not set
@@ -857,7 +869,10 @@ BR2_PACKAGE_ACPID=y
 # BR2_PACKAGE_KBD is not set
 # BR2_PACKAGE_LCDPROC is not set
 # BR2_PACKAGE_LINUX_BACKPORTS is not set
-# BR2_PACKAGE_LIRC_TOOLS is not set
+
+#
+# lirc-tools needs a uClibc or (e)glibc toolchain w/ threads, dynamic library, C++
+#
 # BR2_PACKAGE_LM_SENSORS is not set
 
 #
@@ -869,9 +884,11 @@ BR2_PACKAGE_ACPID=y
 # BR2_PACKAGE_MEMTEST86 is not set
 # BR2_PACKAGE_MEMTESTER is not set
 # BR2_PACKAGE_MINICOM is not set
+# BR2_PACKAGE_MSR_TOOLS is not set
 # BR2_PACKAGE_NANOCOM is not set
 # BR2_PACKAGE_NEARD is not set
 # BR2_PACKAGE_NVIDIA_DRIVER is not set
+# BR2_PACKAGE_NVME is not set
 # BR2_PACKAGE_OFONO is not set
 
 #
@@ -1098,6 +1115,7 @@ BR2_PACKAGE_BOTAN_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBSODIUM is not set
 # BR2_PACKAGE_LIBSSH is not set
 # BR2_PACKAGE_LIBSSH2 is not set
+# BR2_PACKAGE_LIBTOMCRYPT is not set
 # BR2_PACKAGE_LIBUECC is not set
 # BR2_PACKAGE_MBEDTLS is not set
 # BR2_PACKAGE_NETTLE is not set
@@ -1178,12 +1196,16 @@ BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y
 # BR2_PACKAGE_GDK_PIXBUF is not set
 # BR2_PACKAGE_GIFLIB is not set
 
+#
+# granite needs libgtk3 and a toolchain w/ wchar, threads
+#
+
 #
 # graphite2 needs a toolchain w/ C++, dynamic library
 #
 
 #
-# gtkmm3 needs a toolchain w/ C++, wchar, threads, gcc >= 4.8
+# gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.8
 #
 
 #
@@ -1197,6 +1219,10 @@ BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBART is not set
 # BR2_PACKAGE_LIBDMTX is not set
 # BR2_PACKAGE_LIBDRM is not set
+
+#
+# libepoxy needs an OpenGL and/or OpenGL EGL backend
+#
 # BR2_PACKAGE_LIBEXIF is not set
 
 #
@@ -1228,6 +1254,10 @@ BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y
 #
 # libgtk3 needs a toolchain w/ wchar, threads, C++
 #
+
+#
+# libgtk3 needs an OpenGL or OpenGL EGL backend provided by mesa3d
+#
 # BR2_PACKAGE_LIBMNG is not set
 # BR2_PACKAGE_LIBPNG is not set
 # BR2_PACKAGE_LIBQRENCODE is not set
@@ -1277,11 +1307,12 @@ BR2_PACKAGE_MONGODB_ARCH_SUPPORTS=y
 #
 # BR2_PACKAGE_TIFF is not set
 # BR2_PACKAGE_WAYLAND is not set
-BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS=y
+BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS=y
 
 #
-# webkitgtk24 needs libgtk2 and a toolchain w/ C++, wchar, NPTL, gcc >=4.8
+# webkitgtk needs libgtk3 and an (e)glibc toolchain w/ C++, gcc >= 4.9
 #
+BR2_PACKAGE_WEBKITGTK24_ARCH_SUPPORTS=y
 # BR2_PACKAGE_WEBP is not set
 
 #
@@ -1352,6 +1383,7 @@ BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBSIGROKDECODE is not set
 # BR2_PACKAGE_LIBSOC is not set
 # BR2_PACKAGE_LIBUSB is not set
+# BR2_PACKAGE_LIBUSBGX is not set
 
 #
 # libv4l needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0
@@ -1360,6 +1392,7 @@ BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS=y
 # BR2_PACKAGE_MRAA is not set
 # BR2_PACKAGE_MTDEV is not set
 # BR2_PACKAGE_NEARDAL is not set
+# BR2_PACKAGE_OWFS is not set
 # BR2_PACKAGE_PCSC_LITE is not set
 # BR2_PACKAGE_TSLIB is not set
 
@@ -1412,6 +1445,7 @@ BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS=y
 # BR2_PACKAGE_MXML is not set
 # BR2_PACKAGE_RAPIDJSON is not set
 # BR2_PACKAGE_RAPIDXML is not set
+# BR2_PACKAGE_RAPTOR is not set
 
 #
 # tinyxml needs a toolchain w/ C++
@@ -1421,6 +1455,10 @@ BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS=y
 # tinyxml2 needs a toolchain w/ C++
 #
 
+#
+# valijson needs a toolchain w/ C++, threads, wchar  support
+#
+
 #
 # xerces-c++ needs a toolchain w/ C++, wchar
 #
@@ -1579,6 +1617,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBOPING is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
+
+#
+# libpjsip needs a toolchain w/ C++, threads
+#
 # BR2_PACKAGE_LIBRSYNC is not set
 # BR2_PACKAGE_LIBSHAIRPLAY is not set
 # BR2_PACKAGE_LIBSHOUT is not set
@@ -1600,8 +1642,13 @@ BR2_PACKAGE_LIBTIRPC=y
 # BR2_PACKAGE_LIBVNCSERVER is not set
 # BR2_PACKAGE_LIBWEBSOCK is not set
 # BR2_PACKAGE_LIBWEBSOCKETS is not set
+# BR2_PACKAGE_LKSCTP_TOOLS is not set
 # BR2_PACKAGE_MONGOOSE is not set
 # BR2_PACKAGE_NEON is not set
+
+#
+# norm needs a toolchain w/ C++, threads, dynamic library
+#
 # BR2_PACKAGE_NSS_PAM_LDAPD is not set
 
 #
@@ -1635,7 +1682,7 @@ BR2_PACKAGE_LIBTIRPC=y
 #
 
 #
-# zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.6
+# zmqpp needs a toolchain w/ C++, wchar, threads, gcc >= 4.7
 #
 
 #
@@ -1725,6 +1772,7 @@ BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBEVDEV is not set
 BR2_PACKAGE_LIBEVENT=y
 # BR2_PACKAGE_LIBFFI is not set
+# BR2_PACKAGE_LIBGEE is not set
 # BR2_PACKAGE_LIBGLIB2 is not set
 
 #
@@ -1750,6 +1798,7 @@ BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y
 #
 # BR2_PACKAGE_LIBSIGSEGV is not set
 # BR2_PACKAGE_LIBTASN1 is not set
+# BR2_PACKAGE_LIBTOMMATH is not set
 # BR2_PACKAGE_LIBTPL is not set
 # BR2_PACKAGE_LIBUBOX is not set
 # BR2_PACKAGE_LIBUCI is not set
@@ -1869,6 +1918,10 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
 #
 # BR2_PACKAGE_SHARED_MIME_INFO is not set
 # BR2_PACKAGE_SNOWBALL_INIT is not set
+
+#
+# taskd needs a toolchain w/ C++, wchar
+#
 # BR2_PACKAGE_XUTIL_UTIL_MACROS is not set
 
 #
@@ -1897,10 +1950,18 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
 # BR2_PACKAGE_BRIDGE_UTILS is not set
 # BR2_PACKAGE_BWM_NG is not set
 # BR2_PACKAGE_C_ICAP is not set
+
+#
+# cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8
+#
 # BR2_PACKAGE_CAN_UTILS is not set
 # BR2_PACKAGE_CHRONY is not set
 # BR2_PACKAGE_CIVETWEB is not set
 # BR2_PACKAGE_CONNMAN is not set
+
+#
+# connman-gtk needs libgtk3 and a toolchain w/ wchar, threads, resolver, dynamic library
+#
 # BR2_PACKAGE_CONNTRACK_TOOLS is not set
 # BR2_PACKAGE_CRDA is not set
 
@@ -1920,13 +1981,18 @@ BR2_PACKAGE_DHCPCD=y
 # BR2_PACKAGE_EBTABLES is not set
 
 #
-# ejabberd needs erlang
+# ejabberd needs erlang, toolchain w/ C++
 #
 # BR2_PACKAGE_ETHTOOL is not set
 # BR2_PACKAGE_FAIFA is not set
 # BR2_PACKAGE_FASTD is not set
 # BR2_PACKAGE_FCGIWRAP is not set
+# BR2_PACKAGE_FLANNEL is not set
 # BR2_PACKAGE_FPING is not set
+
+#
+# freeswitch needs a toolchain w/ C++, dynamic library, threads, wchar
+#
 # BR2_PACKAGE_GESFTPSERVER is not set
 
 #
@@ -2006,7 +2072,7 @@ BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y
 # BR2_PACKAGE_MONKEY is not set
 
 #
-# mosh needs a toolchain w/ C++, threads, dynamic library
+# mosh needs a toolchain w/ C++, threads, dynamic library, wchar
 #
 # BR2_PACKAGE_MOSQUITTO is not set
 # BR2_PACKAGE_MROUTED is not set
@@ -2031,6 +2097,10 @@ BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS=y
 # BR2_PACKAGE_NGIRCD is not set
 # BR2_PACKAGE_NGREP is not set
 
+#
+# nload needs a toolchain w/ C++
+#
+
 #
 # nmap needs a toolchain w/ C++, threads
 #
@@ -2057,15 +2127,19 @@ BR2_PACKAGE_OPENSSH=y
 # BR2_PACKAGE_P910ND is not set
 # BR2_PACKAGE_PHIDGETWEBSERVICE is not set
 # BR2_PACKAGE_PORTMAP is not set
+# BR2_PACKAGE_POUND is not set
 # BR2_PACKAGE_PPPD is not set
 # BR2_PACKAGE_PPTP_LINUX is not set
+# BR2_PACKAGE_PRIVOXY is not set
 # BR2_PACKAGE_PROFTPD is not set
 # BR2_PACKAGE_PROXYCHAINS_NG is not set
 # BR2_PACKAGE_PTPD is not set
 # BR2_PACKAGE_PTPD2 is not set
 # BR2_PACKAGE_PURE_FTPD is not set
+# BR2_PACKAGE_PUTTY is not set
 # BR2_PACKAGE_QUAGGA is not set
 # BR2_PACKAGE_RADVD is not set
+# BR2_PACKAGE_RP_PPPOE is not set
 # BR2_PACKAGE_RPCBIND is not set
 # BR2_PACKAGE_RSH_REDONE is not set
 BR2_PACKAGE_RSYNC=y
@@ -2093,7 +2167,7 @@ BR2_PACKAGE_RSYNC=y
 # BR2_PACKAGE_SPICE_PROTOCOL is not set
 
 #
-# squid needs a toolchain w/ C++, headers >= 3.0
+# squid needs a toolchain w/ C++
 #
 # BR2_PACKAGE_SSHPASS is not set
 # BR2_PACKAGE_STRONGSWAN is not set
@@ -2124,6 +2198,7 @@ BR2_PACKAGE_WGET=y
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
 # BR2_PACKAGE_WIRESHARK is not set
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
+# BR2_PACKAGE_WPAN_TOOLS is not set
 
 #
 # wvdial needs a (e)glibc or uClibc toolchain w/ C++, dynamic library
@@ -2239,6 +2314,7 @@ BR2_PACKAGE_SUDO=y
 # System tools
 #
 # BR2_PACKAGE_ACL is not set
+# BR2_PACKAGE_ANDROID_TOOLS is not set
 # BR2_PACKAGE_ATTR is not set
 BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y
 # BR2_PACKAGE_AUDIT is not set
@@ -2247,6 +2323,7 @@ BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y
 # BR2_PACKAGE_CPULOAD is not set
 # BR2_PACKAGE_DCRON is not set
 # BR2_PACKAGE_DEBIANUTILS is not set
+# BR2_PACKAGE_CGROUPFS_MOUNT is not set
 # BR2_PACKAGE_EMLOG is not set
 # BR2_PACKAGE_FTOP is not set
 # BR2_PACKAGE_GETENT is not set
@@ -2271,10 +2348,12 @@ BR2_PACKAGE_AUDIT_ARCH_SUPPORTS=y
 # BR2_PACKAGE_OPENVMTOOLS is not set
 # BR2_PACKAGE_POLKIT is not set
 # BR2_PACKAGE_PROCPS_NG is not set
+# BR2_PACKAGE_PROCRANK_LINUX is not set
 # BR2_PACKAGE_PSMISC is not set
 # BR2_PACKAGE_PWGEN is not set
 # BR2_PACKAGE_QUOTA is not set
 # BR2_PACKAGE_RSYSLOG is not set
+# BR2_PACKAGE_SCRUB is not set
 # BR2_PACKAGE_SCRYPT is not set
 # BR2_PACKAGE_SMACK is not set
 # BR2_PACKAGE_START_STOP_DAEMON is not set
@@ -2348,6 +2427,7 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 # Host utilities
 #
 # BR2_PACKAGE_HOST_AESPIPE is not set
+# BR2_PACKAGE_HOST_ANDROID_TOOLS is not set
 # BR2_PACKAGE_HOST_CHECKPOLICY is not set
 # BR2_PACKAGE_HOST_CRAMFS is not set
 # BR2_PACKAGE_HOST_DFU_UTIL is not set
@@ -2360,6 +2440,7 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 # BR2_PACKAGE_HOST_GENEXT2FS is not set
 # BR2_PACKAGE_HOST_GENIMAGE is not set
 # BR2_PACKAGE_HOST_GENPART is not set
+BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS=y
 # BR2_PACKAGE_HOST_GPTFDISK is not set
 # BR2_PACKAGE_HOST_JQ is not set
 # BR2_PACKAGE_HOST_LPC3250LOADER is not set
@@ -2376,11 +2457,38 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 # BR2_PACKAGE_HOST_UBOOT_TOOLS is not set
 # BR2_PACKAGE_HOST_UTIL_LINUX is not set
 # BR2_PACKAGE_HOST_VBOOT_UTILS is not set
+# BR2_PACKAGE_HOST_XORRISO is not set
+# BR2_PACKAGE_HOST_ZIP is not set
 
 #
 # Legacy config options
 #
 
+#
+# Legacy options removed in 2016.05
+#
+# BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL is not set
+# BR2_PACKAGE_NGINX_HTTP_SPDY_MODULE is not set
+# BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP is not set
+# BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123 is not set
+# BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC is not set
+# BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC_E500V2 is not set
+# BR2_x86_i386 is not set
+# BR2_PACKAGE_QT5WEBKIT_EXAMPLES is not set
+# BR2_PACKAGE_QT5QUICK1 is not set
+# BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR is not set
+# BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID is not set
+# BR2_KERNEL_HEADERS_3_17 is not set
+# BR2_GDB_VERSION_7_7 is not set
+# BR2_PACKAGE_FOOMATIC_FILTERS is not set
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_KODI_WAVPACK is not set
+# BR2_PACKAGE_KODI_RSXS is not set
+# BR2_PACKAGE_KODI_GOOM is not set
+# BR2_PACKAGE_SYSTEMD_ALL_EXTRAS is not set
+# BR2_GCC_VERSION_4_5_X is not set
+# BR2_PACKAGE_SQLITE_READLINE is not set
+
 #
 # Legacy options removed in 2016.02
 #
diff --git a/configs/busybox.config b/configs/busybox.config
index 6dd2b3c..6ebef00 100644
--- a/configs/busybox.config
+++ b/configs/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.24.1
-# Thu Jan 21 07:32:35 2016
+# Busybox version: 1.24.2
+# Tue May 31 23:57:03 2016
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -486,10 +486,10 @@ CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_LAST_SYSTEM_ID=999
 CONFIG_ADDGROUP=y
 # CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELUSER=y
 CONFIG_DELGROUP=y
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
 CONFIG_GETTY=y
 CONFIG_LOGIN=y
 # CONFIG_LOGIN_SESSION_AS_CHILD is not set
@@ -648,7 +648,7 @@ CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
 CONFIG_FEATURE_VOLUMEID_FAT=y
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
diff --git a/overlay/init b/overlay/init
index 12e1e99..f8f6fd9 100755
--- a/overlay/init
+++ b/overlay/init
@@ -30,7 +30,7 @@ mount -t devtmpfs devtmpfs /dev
 
 mkdir -p /var/log
 syslogd
-sleep 1
+usleep 1000
 logger -s -p user.info -t "init[$$]" "Start init"
 
 trap 'logger -s -p user.info -t "init[$$]" "trapped at line $LINENO"' ERR
diff --git a/overlay/sbin/respawn b/overlay/sbin/respawn
index c406749..311a93d 100755
--- a/overlay/sbin/respawn
+++ b/overlay/sbin/respawn
@@ -5,5 +5,4 @@ logger -s -p user.info -t "respawn[$$]" "$*"
 while true; do
   setsid $* &
   wait
-  sleep 1
 done
diff --git a/patches/ntp.patch b/patches/ntp.patch
deleted file mode 100644
index bd05949..0000000
--- a/patches/ntp.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ee18216d47e3d1eb5e9f666a5f30d61d5e4bbd97 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 2 May 2016 09:21:22 -0300
-Subject: ntp: security bump to version 4.2.8p7
-
-Fixes:
-
-CVE-2016-1551 - Refclock impersonation vulnerability, AKA:
-refclock-peering
-
-CVE-2016-1549 - Sybil vulnerability: ephemeral association attack, AKA:
-ntp-sybil - MITIGATION ONLY
-
-CVE-2016-2516 - Duplicate IPs on unconfig directives will cause an
-assertion botch
-
-CVE-2016-2517 - Remote configuration trustedkey/requestkey values are not
-properly validated
-
-CVE-2016-2518 - Crafted addpeer with hmode > 7 causes array wraparound
-with MATCH_ASSOC
-
-CVE-2016-2519 - ctl_getitem() return value not always checked
-
-CVE-2016-1547 - Validate crypto-NAKs, AKA: nak-dos
-
-CVE-2016-1548 - Interleave-pivot - MITIGATION ONLY
-
-CVE-2015-7704 - KoD fix: peer associations were broken by the fix for
-NtpBug2901, AKA: Symmetric active/passive mode is broken
-
-CVE-2015-8138 - Zero Origin Timestamp Bypass, AKA: Additional KoD Checks
-
-CVE-2016-1550 - Improve NTP security against buffer comparison timing
-attacks, authdecrypt-timing, AKA: authdecrypt-timing
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- package/ntp/ntp.hash | 6 +++---
- package/ntp/ntp.mk   | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash
-index 0c2c29d..6be52aa 100644
---- a/package/ntp/ntp.hash
-+++ b/package/ntp/ntp.hash
-@@ -1,4 +1,4 @@
--# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p6.tar.gz.md5
--md5	60049f51e9c8305afe30eb22b711c5c6	ntp-4.2.8p6.tar.gz
-+# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p7.tar.gz.md5
-+md5	46dfba933c3e4bc924d8e55068797578	ntp-4.2.8p7.tar.gz
- # Calculated based on the hash above
--sha256	583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048	ntp-4.2.8p6.tar.gz
-+sha256	81d20c06a0b01abe3b84fac092185bf014252d38fe5e7b2758f604680a0220dc	ntp-4.2.8p7.tar.gz
-diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
-index 2b99ef2..d8ac534 100644
---- a/package/ntp/ntp.mk
-+++ b/package/ntp/ntp.mk
-@@ -5,7 +5,7 @@
- ################################################################################
- 
- NTP_VERSION_MAJOR = 4.2
--NTP_VERSION = $(NTP_VERSION_MAJOR).8p6
-+NTP_VERSION = $(NTP_VERSION_MAJOR).8p7
- NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
- NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox)
- NTP_LICENSE = ntp license
--- 
-cgit v0.12
-
diff --git a/patches/openssh-01.patch b/patches/openssh-01.patch
deleted file mode 100644
index c9257c0..0000000
--- a/patches/openssh-01.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0c62637bdd473236d50ec459c9074ad8a8834129 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 29 Feb 2016 08:59:32 -0300
-Subject: openssh: bump to version 7.2p1
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- package/openssh/openssh.hash | 4 ++--
- package/openssh/openssh.mk   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash
-index b93b4a9..36346e0 100644
---- a/package/openssh/openssh.hash
-+++ b/package/openssh/openssh.hash
-@@ -1,3 +1,3 @@
- # Locally calculated after checking pgp signature
--# Also from http://www.openssh.com/txt/release-7.1p2
--sha256	dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd	openssh-7.1p2.tar.gz
-+# Also from http://www.openssh.com/txt/release-7.2
-+sha256	973cc37b2f3597e4cf599b09e604e79c0fe5d9b6f595a24e91ed0662860b4ac3	openssh-7.2p1.tar.gz
-diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
-index 4e97849..0e0bcab 100644
---- a/package/openssh/openssh.mk
-+++ b/package/openssh/openssh.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--OPENSSH_VERSION = 7.1p2
-+OPENSSH_VERSION = 7.2p1
- OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
- OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
- OPENSSH_LICENSE_FILES = LICENCE
--- 
-cgit v0.12
-
diff --git a/patches/openssh-02.patch b/patches/openssh-02.patch
deleted file mode 100644
index 52c2cdf..0000000
--- a/patches/openssh-02.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 55a94ec8936571df586d4f53ffc1355c651a63d3 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Thu, 10 Mar 2016 15:34:28 -0300
-Subject: openssh: security bump to version 7.2p2
-
-Fixes:
-CVE-2016-3115 - sanitise X11 authentication credentials to avoid xauth
-command injection when X11Forwarding is enabled.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- package/openssh/openssh.hash | 2 +-
- package/openssh/openssh.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash
-index 36346e0..46d9f9b 100644
---- a/package/openssh/openssh.hash
-+++ b/package/openssh/openssh.hash
-@@ -1,3 +1,3 @@
- # Locally calculated after checking pgp signature
- # Also from http://www.openssh.com/txt/release-7.2
--sha256	973cc37b2f3597e4cf599b09e604e79c0fe5d9b6f595a24e91ed0662860b4ac3	openssh-7.2p1.tar.gz
-+sha256	a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c	openssh-7.2p2.tar.gz
-diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
-index 0e0bcab..856646c 100644
---- a/package/openssh/openssh.mk
-+++ b/package/openssh/openssh.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--OPENSSH_VERSION = 7.2p1
-+OPENSSH_VERSION = 7.2p2
- OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
- OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
- OPENSSH_LICENSE_FILES = LICENCE
--- 
-cgit v0.12
-
diff --git a/patches/openssl.patch b/patches/openssl.patch
deleted file mode 100644
index e9a5541..0000000
--- a/patches/openssl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2de25704771bfe34fb87a01dad3987c5c93404eb Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 3 May 2016 11:39:33 -0300
-Subject: openssl: security bump to version 1.0.2h
-
-Fixes:
-CVE-2016-2105 - Fix EVP_EncodeUpdate overflow
-CVE-2016-2106 - Fix EVP_EncryptUpdate overflow
-CVE-2016-2107 - Prevent padding oracle in AES-NI CBC MAC check
-CVE-2016-2109 - Prevent ASN.1 BIO excessive memory allocation
-CVE-2016-2176 - EBCDIC overread
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- package/openssl/openssl.hash | 4 ++--
- package/openssl/openssl.mk   | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/openssl/openssl.hash b/package/openssl/openssl.hash
-index e3ea2ae..edbce8e 100644
---- a/package/openssl/openssl.hash
-+++ b/package/openssl/openssl.hash
-@@ -1,5 +1,5 @@
--# From https://www.openssl.org/source/openssl-1.0.2g.tar.gz.sha256
--sha256	b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33	openssl-1.0.2g.tar.gz
-+# From https://www.openssl.org/source/openssl-1.0.2h.tar.gz.sha256
-+sha256	1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919	openssl-1.0.2h.tar.gz
- # Locally computed
- sha256	eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9	openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
- sha256	147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f	openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
-index 2f50dfb..2368aa9 100644
---- a/package/openssl/openssl.mk
-+++ b/package/openssl/openssl.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--OPENSSL_VERSION = 1.0.2g
-+OPENSSL_VERSION = 1.0.2h
- OPENSSL_SITE = http://www.openssl.org/source
- OPENSSL_LICENSE = OpenSSL or SSLeay
- OPENSSL_LICENSE_FILES = LICENSE
--- 
-cgit v0.12
-