diff --git a/Gemfile.lock b/Gemfile.lock
index 6fd7dc8c2dca..4b25d9e142c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,7 @@ PATH
       rubyzip
       sqlite3
       tzinfo
+      tzinfo-data
 
 GEM
   remote: https://rubygems.org/
@@ -241,6 +242,8 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2016.4)
+      tzinfo (>= 1.0.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7.6)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 41b9855c6d4d..839449115101 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -94,7 +94,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redcarpet'
   # Needed for Microsoft patch finding tool (msu_finder)
   spec.add_runtime_dependency 'patch_finder'
-
+  # TimeZone info
+  spec.add_runtime_dependency 'tzinfo-data'
+  
   # rb-readline doesn't work with Ruby Installer due to error with Fiddle:
   #   NoMethodError undefined method `dlopen' for Fiddle:Module
   unless Gem.win_platform?