diff --git a/Berksfile b/Berksfile
index 87dd1ce3..2d52ccf4 100644
--- a/Berksfile
+++ b/Berksfile
@@ -2,10 +2,10 @@ source 'https://supermarket.chef.io'
 
 # The apt cookbook is required to bring the apt cache up-to-date on Ubuntu
 # systems, since the cache can become stale on older boxes.
-cookbook 'apt', '~> 2.8'
-cookbook 'yum-epel', '~> 0.6'
+cookbook 'apt', '~> 5'
+cookbook 'yum-epel', '~> 2.1'
 
-cookbook 'omnibus', '~> 4'
+cookbook 'omnibus', '~> 5'
 
 # Uncomment to use the latest version of the Omnibus cookbook from GitHub
 # cookbook 'omnibus', github: 'opscode-cookbooks/omnibus'
diff --git a/Berksfile.lock b/Berksfile.lock
index d3ec0231..68550ae1 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -1,53 +1,48 @@
 DEPENDENCIES
-  apt (~> 2.8)
-  omnibus (~> 4)
-  yum-epel (~> 0.6)
+  apt (~> 5)
+  omnibus (~> 5)
+  yum-epel (~> 2.1)
 
 GRAPH
-  apt (2.9.2)
-  build-essential (6.0.4)
-    compat_resource (>= 12.10)
+  apt (5.0.1)
+    compat_resource (>= 12.16.3)
+  build-essential (7.0.3)
+    compat_resource (>= 12.16.3)
     mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-ingredient (0.19.0)
+  chef-ingredient (0.21.2)
+    compat_resource (>= 12.10)
   chef-sugar (3.4.0)
-  chef_handler (1.4.0)
-  compat_resource (12.14.0)
-  dmg (2.4.0)
-  git (4.6.0)
+  compat_resource (12.16.3)
+  dmg (3.0.0)
+  git (5.0.1)
     build-essential (>= 0.0.0)
     dmg (>= 0.0.0)
-    windows (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  homebrew (2.1.0)
-    build-essential (>= 2.1.2)
-  languages (0.2.8)
-    build-essential (>= 0.0.0)
-    chef-sugar (>= 0.0.0)
-    homebrew (>= 0.0.0)
-    remote_install (>= 0.0.0)
+  homebrew (3.0.0)
   mingw (1.2.4)
     compat_resource (>= 0.0.0)
     seven_zip (>= 0.0.0)
-  omnibus (4.2.4)
+  ohai (4.2.3)
+    compat_resource (>= 12.14.7)
+  omnibus (5.0.0)
     build-essential (>= 6.0.0)
     chef-ingredient (>= 0.18.0)
     chef-sugar (>= 3.2.0)
     git (>= 0.0.0)
     homebrew (>= 0.0.0)
-    languages (>= 0.0.0)
     remote_install (>= 0.0.0)
+    seven_zip (>= 0.0.0)
     windows (>= 0.0.0)
     windows-sdk (>= 0.0.0)
     wix (>= 0.0.0)
   remote_install (1.0.2)
   seven_zip (2.0.2)
     windows (>= 1.2.2)
-  windows (1.44.3)
-    chef_handler (>= 0.0.0)
+  windows (2.1.1)
+    ohai (>= 4.0.0)
   windows-sdk (1.0.2)
-  wix (2.0.2)
+  wix (3.0.0)
     windows (>= 1.38.2)
-  yum (3.12.0)
-  yum-epel (0.7.1)
-    yum (>= 3.6.3)
+  yum-epel (2.1.1)
+    compat_resource (>= 12.16.3)
diff --git a/Gemfile.lock b/Gemfile.lock
index a9dd7bba..fae92234 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: 2186b5816b13c5712d17ffe66e7cab8cf28ca735
+  revision: 7f1b5f2bef8ca0d248d943688dd78cceaa1b18c5
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -11,12 +11,14 @@ GEM
   specs:
     addressable (2.3.8)
     artifactory (2.3.3)
-    aws-sdk (2.6.3)
-      aws-sdk-resources (= 2.6.3)
-    aws-sdk-core (2.6.3)
+    aws-sdk (2.6.42)
+      aws-sdk-resources (= 2.6.42)
+    aws-sdk-core (2.6.42)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.3)
-      aws-sdk-core (= 2.6.3)
+    aws-sdk-resources (2.6.42)
+      aws-sdk-core (= 2.6.42)
+    aws-sigv4 (1.0.0)
     berkshelf (3.3.0)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -50,7 +52,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.89)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -104,7 +106,7 @@ GEM
     nio4r (1.2.1)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    ohai (8.20.0)
+    ohai (8.22.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -193,7 +195,7 @@ GEM
       net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
-    thor (0.19.1)
+    thor (0.19.4)
     timers (4.0.4)
       hitimes
     varia_model (0.4.1)
diff --git a/Vagrantfile b/Vagrantfile
index 4ba7a762..bfb61176 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,6 +26,7 @@ Vagrant.configure('2') do |config|
     ubuntu-14.04
     ubuntu-14.04-i386
     ubuntu-16.04
+    ubuntu-16.04-i386
     debian-7.10
     debian-8.4
     centos-5.11
diff --git a/bin/pkg_build b/bin/pkg_build
index 0b3ef896..35637dba 100755
--- a/bin/pkg_build
+++ b/bin/pkg_build
@@ -12,6 +12,7 @@ unless ARGV.include?('--without-deb')
     "ubuntu-14.04",
     "ubuntu-12.04",
     #"ubuntu-10.04",
+    "ubuntu-16.04-i386",
     "ubuntu-14.04-i386",
     "ubuntu-12.04-i386",
     #"ubuntu-10.04-i386"
diff --git a/config/projects/td-agent2.rb b/config/projects/td-agent2.rb
index 93d3bbb0..d3e52c61 100644
--- a/config/projects/td-agent2.rb
+++ b/config/projects/td-agent2.rb
@@ -10,7 +10,7 @@
 license_file "LICENSE"
 
 install_dir     "/opt/td-agent"
-build_version   "2.3.3"
+build_version   "2.3.4"
 build_iteration 0
 
 # creates required build directories
diff --git a/config/software/fluentd-ui.rb b/config/software/fluentd-ui.rb
index 464d0e41..cc1e3a79 100644
--- a/config/software/fluentd-ui.rb
+++ b/config/software/fluentd-ui.rb
@@ -1,5 +1,5 @@
 name "fluentd-ui"
-default_version 'bd37b6393c25d3bcf941a12b42545488127703e0'
+default_version '7848500e6af4bb1b90f19f7c6cce765a004ae0e2'
 
 dependency "ruby"
 
diff --git a/config/software/liblzma.rb b/config/software/liblzma.rb
new file mode 100644
index 00000000..2f28131d
--- /dev/null
+++ b/config/software/liblzma.rb
@@ -0,0 +1,47 @@
+#
+# Copyright 2014 Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name "liblzma"
+default_version "5.2.3"
+
+license "Public-Domain"
+license_file "COPYING"
+skip_transitive_dependency_licensing true
+
+source url: "http://tukaani.org/xz/xz-#{version}.tar.gz",
+       md5: "ef68674fb47a8b8e741b34e429d86e9d"
+
+relative_path "xz-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+  # liblzma properly uses CFLAGS for C compilation and CPPFLAGS for common
+  # flags used across tools such as windres.  Don't put anything in it
+  # that can be misinterpreted by windres.
+  env["CPPFLAGS"] = "-I#{install_dir}/embedded/include" if windows?
+
+  config_command = [
+    "--disable-debug",
+    "--disable-dependency-tracking",
+    "--disable-doc",
+    "--disable-scripts",
+  ]
+  config_command << "--disable-nls" if windows?
+
+  configure(*config_command, env: env)
+
+  make "install", env: env
+end
diff --git a/core_gems.rb b/core_gems.rb
index 176d27f1..6e60cfb7 100644
--- a/core_gems.rb
+++ b/core_gems.rb
@@ -5,6 +5,6 @@
 download "http_parser.rb", "0.6.0"
 download "yajl-ruby", "1.3.0"
 download "sigdump", "0.2.4"
-download "oj", "2.17.4"
+download "oj", "2.18.0"
 download "tzinfo", "1.2.2"
-download "tzinfo-data", "1.2016.8"
+download "tzinfo-data", "1.2016.10"
diff --git a/plugin_gems.rb b/plugin_gems.rb
index 6c005ab8..677bd94d 100644
--- a/plugin_gems.rb
+++ b/plugin_gems.rb
@@ -1,16 +1,16 @@
 dir 'plugin_gems'
 download "httpclient", "2.8.2.4"
-download "td-client", "0.8.84"
-download "td", "0.15.1"
+download "td-client", "0.8.85"
+download "td", "0.15.2"
 download "fluent-plugin-td", "0.10.29"
 download "uuidtools", "2.1.5"
-download "aws-sdk", "2.6.3"
-download "fluent-plugin-s3", "0.7.1"
+download "aws-sdk", "2.6.42"
+download "fluent-plugin-s3", "0.8.0"
 download "webhdfs", "0.8.0"
 download "fluent-plugin-webhdfs", "0.4.2"
 download "fluent-plugin-rewrite-tag-filter", "1.5.5"
 unless windows?
   download "ruby-kafka", "0.3.15"
-  download "fluent-plugin-kafka", "0.3.5"
+  download "fluent-plugin-kafka", "0.4.1"
 end
 download "fluent-plugin-td-monitoring", "0.2.2"