diff --git a/assets/javascripts/views/pages/go.coffee b/assets/javascripts/views/pages/go.coffee
deleted file mode 100644
index 916e0620..00000000
--- a/assets/javascripts/views/pages/go.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-#= require views/pages/base
-
-class app.views.GoPage extends app.views.BasePage
-  prepare: ->
-    @highlightCode @findAll('pre'), 'go'
-    return
diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee
index f02f1244..cd508efa 100644
--- a/assets/javascripts/views/pages/simple.coffee
+++ b/assets/javascripts/views/pages/simple.coffee
@@ -6,6 +6,7 @@ class app.views.SimplePage extends app.views.BasePage
       @highlightCode el, el.getAttribute('data-language')
     return
 
+app.views.GoPage =
 app.views.MeteorPage =
 app.views.RamdaPage =
 app.views.ReactPage =
diff --git a/lib/docs/filters/go/clean_html.rb b/lib/docs/filters/go/clean_html.rb
index 20803f42..7b22914c 100644
--- a/lib/docs/filters/go/clean_html.rb
+++ b/lib/docs/filters/go/clean_html.rb
@@ -30,6 +30,7 @@ module Docs
 
         # Remove code highlighting
         css('pre').each do |node|
+          node['data-language'] = 'go'
           node.content = node.content
         end
 
diff --git a/lib/docs/scrapers/go.rb b/lib/docs/scrapers/go.rb
index 35ea4ee0..eff13db6 100644
--- a/lib/docs/scrapers/go.rb
+++ b/lib/docs/scrapers/go.rb
@@ -1,7 +1,7 @@
 module Docs
   class Go < UrlScraper
     self.type = 'go'
-    self.release = '1.5.2'
+    self.release = '1.6.0'
     self.base_url = 'https://golang.org/pkg/'
     self.links = {
       home: 'https://golang.org/',
@@ -10,6 +10,7 @@ module Docs
 
     html_filters.push 'go/clean_html', 'go/entries'
 
+    options[:trailing_slash] = true
     options[:container] = '#page .container'
 
     options[:attribution] = <<-HTML