diff --git a/lib/docs/filters/coffeescript/clean_html.rb b/lib/docs/filters/coffeescript/clean_html.rb
index 3d51418d..fe8406e6 100644
--- a/lib/docs/filters/coffeescript/clean_html.rb
+++ b/lib/docs/filters/coffeescript/clean_html.rb
@@ -6,16 +6,12 @@ module Docs
 
         # Set id attributes on actual elements instead of an empty <span>
         css('.bookmark').each do |node|
-          if node.parent.name == 'h2'
-            node.parent['id'] = node['id']
-          elsif node.next_element.name == 'b'
-            node.next_element['id'] = node['id']
-          end
+          node.next_element['id'] = node['id']
           node.remove
         end
 
         # Remove Books, Screencasts, etc.
-        while doc.children.last['id'] != 'scripts'
+        while doc.children.last['id'] != 'resources'
           doc.children.last.remove
         end
         doc.children.last.remove
@@ -50,6 +46,10 @@ module Docs
           node.content = node.content
         end
 
+        css('blockquote > pre:first-child:last-child').each do |node|
+          node.parent.before(node).remove
+        end
+
         css('.code pre:first-child').each do |node|
           node['data-language'] = 'coffeescript'
         end
diff --git a/lib/docs/filters/coffeescript/entries.rb b/lib/docs/filters/coffeescript/entries.rb
index 21f3e229..e6653324 100644
--- a/lib/docs/filters/coffeescript/entries.rb
+++ b/lib/docs/filters/coffeescript/entries.rb
@@ -30,7 +30,11 @@ module Docs
         ['super',                       'classes',                  'Statements'],
         ['::',                          'classes',                  'Operators'],
         ['Destructuring assignment',    'destructuring',            'Language'],
+        ['Bound Functions',             'fat-arrow',                'Language'],
+        ['Generator Functions',         'fat-arrow',                'Language'],
         ['=>',                          'fat-arrow',                'Statements'],
+        ['yield',                       'fat-arrow',                'Statements'],
+        ['for...from',                  'fat-arrow',                'Statements'],
         ['Embedded JavaScript',         'embedded',                 'Language'],
         ['switch...when...else',        'switch',                   'Statements'],
         ['try...catch...finally',       'try',                      'Statements'],
@@ -40,6 +44,7 @@ module Docs
         ['"""',                         'strings',                  'Language'],
         ['Block comments',              'strings',                  'Language'],
         ['###',                         'strings',                  'Language'],
+        ['Tagged Template Literals',    'tagged-template-literals',  'Language'],
         ['Block regexes',               'regexes',                  'Language'],
         ['///',                         'regexes',                  'Language'],
         ['Modules',                     'modules',                  'Language'],
diff --git a/lib/docs/scrapers/coffeescript.rb b/lib/docs/scrapers/coffeescript.rb
index d530d329..46555ce1 100644
--- a/lib/docs/scrapers/coffeescript.rb
+++ b/lib/docs/scrapers/coffeescript.rb
@@ -2,7 +2,7 @@ module Docs
   class Coffeescript < UrlScraper
     self.name = 'CoffeeScript'
     self.type = 'coffeescript'
-    self.release = '1.11.0'
+    self.release = '1.12.2'
     self.base_url = 'http://coffeescript.org'
     self.links = {
       home: 'http://coffeescript.org',