diff --git a/assets/images/icons.png b/assets/images/icons.png
index adffce73..f56a35ed 100644
Binary files a/assets/images/icons.png and b/assets/images/icons.png differ
diff --git a/assets/images/icons@2x.png b/assets/images/icons@2x.png
index a495193a..1cf651d9 100644
Binary files a/assets/images/icons@2x.png and b/assets/images/icons@2x.png differ
diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index 1b9742a6..caeeb5de 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -227,6 +227,11 @@ credits = [
     'Joyent, Inc. and other Node contributors<br>Node.js is a trademark of Joyent, Inc.',
     'MIT',
     'https://raw.github.com/joyent/node/master/LICENSE'
+  ], [
+    'Nokogiri',
+    '2008-2014 2014 Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada, Akinori Musha',
+    'MIT',
+    'https://github.com/sparklemotion/nokogiri/blob/master/README.rdoc#license'
   ], [
     'PHP',
     '1997-2014 The PHP Documentation Group',
diff --git a/assets/javascripts/templates/pages/news_tmpl.coffee b/assets/javascripts/templates/pages/news_tmpl.coffee
index 0758629b..175ff324 100644
--- a/assets/javascripts/templates/pages/news_tmpl.coffee
+++ b/assets/javascripts/templates/pages/news_tmpl.coffee
@@ -34,7 +34,7 @@ newsItem = (date, news) ->
 
 app.news = [
   [ 1417305600000, # November 30, 2014
-    """ New <a href="/phpunit/">PHPUnit</a> documentation """
+    """ New <a href="/phpunit/">PHPUnit</a> and <a href="/nokogiri/">Nokogiri</a> documentations """
   ], [
     1416096000000, # November 16, 2014
     """ New <a href="/python2/">Python 2</a> documentation """
diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss
index 6ee669c7..38fb1def 100644
--- a/assets/stylesheets/global/_icons.scss
+++ b/assets/stylesheets/global/_icons.scss
@@ -71,3 +71,4 @@
 ._icon-marionette:before    { background-position: -1rem -11rem; }
 ._icon-mongoose:before      { background-position: -2rem -11rem; }
 ._icon-phpunit:before       { background-position: -3rem -11rem; }
+._icon-nokogiri:before      { background-position: -4rem -11rem; }
diff --git a/lib/docs/filters/nokogiri2/entries.rb b/lib/docs/filters/nokogiri2/entries.rb
new file mode 100644
index 00000000..642ff73b
--- /dev/null
+++ b/lib/docs/filters/nokogiri2/entries.rb
@@ -0,0 +1,11 @@
+module Docs
+  class Nokogiri2
+    class EntriesFilter < Docs::Rdoc::EntriesFilter
+      def get_type
+        type = name.dup
+        type.remove! %r{#.+\z}
+        type.split('::')[0..2].join('::')
+      end
+    end
+  end
+end
diff --git a/lib/docs/scrapers/nokogiri2.rb b/lib/docs/scrapers/nokogiri2.rb
new file mode 100644
index 00000000..21f1f8fe
--- /dev/null
+++ b/lib/docs/scrapers/nokogiri2.rb
@@ -0,0 +1,19 @@
+module Docs
+  class Nokogiri2 < Rdoc
+    self.name = 'Nokogiri'
+    self.slug = 'nokogiri'
+    self.version = '1.6.4'
+    self.dir = '/Users/Thibaut/DevDocs/Docs/RDoc/Nokogiri'
+
+    html_filters.replace 'rdoc/entries', 'nokogiri2/entries'
+
+    options[:root_title] = 'Nokogiri'
+    options[:only_patterns] = [/\ANokogiri/]
+
+    options[:attribution] = <<-HTML
+      &copy; 2008&ndash;2014 Aaron Patterson, Mike Dalessio, Charles Nutter,<br>
+      Sergio Arbeo, Patrick Mahoney, Yoko Harada, Akinori Musha<br>
+      Licensed under the MIT License.
+    HTML
+  end
+end
diff --git a/public/icons/docs/nokogiri/16.png b/public/icons/docs/nokogiri/16.png
new file mode 100644
index 00000000..a467db39
Binary files /dev/null and b/public/icons/docs/nokogiri/16.png differ
diff --git a/public/icons/docs/nokogiri/16@2x.png b/public/icons/docs/nokogiri/16@2x.png
new file mode 100644
index 00000000..dad2dbde
Binary files /dev/null and b/public/icons/docs/nokogiri/16@2x.png differ