diff --git a/Gemfile b/Gemfile
index c30860255d89..9e9c5fdd8977 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 group :development do
   gem 'rake', '~> 10.0'
-  gem 'jekyll', '~> 3.0'
+  gem 'jekyll', '~> 3.6'
   gem 'compass', '~> 0.12'
   gem 'sass-globbing', '~> 1.0'
   gem 'stringex', '~> 1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index d706705eb308..da12965b2ac4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     chunky_png (1.3.8)
     coderay (1.1.1)
     colorator (1.1.0)
@@ -10,19 +10,19 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    ffi (1.9.18)
+    ffi (1.15.4)
     forwardable-extended (2.6.0)
     fssm (0.2.10)
-    jekyll (3.5.2)
+    jekyll (3.6.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      kramdown (~> 1.14)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 3)
       safe_yaml (~> 1.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.12.1)
@@ -33,13 +33,13 @@ GEM
       jekyll (~> 3.3)
     jekyll-time-to-read (0.1.2)
       jekyll
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
-    liquid (4.0.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    jekyll-watch (1.5.1)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.3)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     method_source (0.8.2)
     octopress (3.0.11)
@@ -61,23 +61,23 @@ GEM
       octopress-tag-helpers (~> 1.0)
     octopress-tag-helpers (1.0.8)
       jekyll (>= 2.0)
-    pathutil (0.14.0)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (3.0.0)
+    public_suffix (4.0.6)
     rack (1.6.8)
     rack-protection (1.5.3)
       rack
     rake (10.5.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     redcarpet (3.4.0)
-    rouge (1.11.1)
-    safe_yaml (1.0.4)
+    rouge (2.2.1)
+    safe_yaml (1.0.5)
     sass (3.2.19)
     sass-globbing (1.1.5)
       sass (>= 3.1)
@@ -95,7 +95,7 @@ PLATFORMS
 
 DEPENDENCIES
   compass (~> 0.12)
-  jekyll (~> 3.0)
+  jekyll (~> 3.6)
   jekyll-paginate
   jekyll-redirect-from
   jekyll-sitemap