diff --git a/jekyll-gist.gemspec b/jekyll-gist.gemspec
index d1ec8f5..c88b5e7 100644
--- a/jekyll-gist.gemspec
+++ b/jekyll-gist.gemspec
@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
   spec.add_development_dependency "jekyll", "~> 2.0"
 end
diff --git a/lib/jekyll-gist/gist_tag.rb b/lib/jekyll-gist/gist_tag.rb
index 9822bd7..a78174f 100644
--- a/lib/jekyll-gist/gist_tag.rb
+++ b/lib/jekyll-gist/gist_tag.rb
@@ -1,3 +1,6 @@
+require 'cgi'
+require 'open-uri'
+
 module Jekyll
   module Gist
     class GistTag < Liquid::Tag
@@ -11,7 +14,9 @@ def render(context)
           if context.has_key?(filename)
             filename = context[filename]
           end
-          gist_script_tag(gist_id, filename)
+          noscript_tag = gist_noscript_tag(gist_id, filename)
+          script_tag = gist_script_tag(gist_id, filename)
+          "#{noscript_tag}#{script_tag}"
         else
           raise ArgumentError.new <<-eos
   Syntax error in tag 'gist' while parsing the following markup:
@@ -35,13 +40,33 @@ def determine_arguments(input)
       end
 
       def gist_script_tag(gist_id, filename = nil)
-        if filename.empty?
-          "<script src=\"https://gist.github.com/#{gist_id}.js\"> </script>"
+        url = "https://gist.github.com/#{gist_id}.js"
+        url = "#{url}?file=#{filename}" unless filename.empty?
+        "<script src=\"#{url}\"> </script>"
+      end
+
+      def gist_noscript_tag(gist_id, filename = nil)
+        code = fetch_raw_code(gist_id, filename)
+        if !code.nil?
+          "<noscript><pre>#{CGI.escapeHTML(code)}</pre></noscript>"
         else
-          "<script src=\"https://gist.github.com/#{gist_id}.js?file=#{filename}\"> </script>"
+          Jekyll.logger.warn "Warning:", "The <noscript> tag for your gist #{gist_id} could not"
+          Jekyll.logger.warn "", "be generated. This will affect users who do not have"
+          Jekyll.logger.warn "", "JavaScript available or enabled in their browsers."
         end
       end
 
+      def fetch_raw_code(gist_id, filename = nil)
+        begin
+          url = "https://gist.githubusercontent.com/#{gist_id}/raw"
+          url = "#{url}/#{filename}" unless filename.empty?
+          open(url).read.chomp
+        rescue SocketError
+          nil
+        rescue OpenURI::HTTPError
+          nil
+        end
+      end
     end
   end
 end
diff --git a/spec/gist_tag_spec.rb b/spec/gist_tag_spec.rb
index 64c5df7..e10b177 100644
--- a/spec/gist_tag_spec.rb
+++ b/spec/gist_tag_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe(Jekyll::Gist::GistTag) do
+  let(:http_output) { "<test>true</test>" }
   let(:doc) { doc_with_content(content) }
   let(:content)  { "{% gist #{gist} %}" }
   let(:output) do
@@ -11,30 +12,43 @@
 
   context "valid gist" do
     context "with user prefix" do
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist}/raw").to_return(body: http_output) }
       let(:gist) { "mattr-/24081a1d93d2898ecf0f" }
 
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
 
     context "without user prefix" do
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist}/raw").to_return(body: http_output) }
       let(:gist) { "28949e1d5ee2273f9fd3" }
 
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
 
     context "classic Gist id style" do
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist}/raw").to_return(body: http_output) }
       let(:gist) { "1234321" }
 
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js">\s<\/script>/)
       end
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
 
     context "with file specified" do
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist}/raw/#{filename}").to_return(body: http_output) }
       let(:gist)     { "mattr-/24081a1d93d2898ecf0f" }
       let(:filename) { "myfile.ext" }
       let(:content)  { "{% gist #{gist} #{filename} %}" }
@@ -42,12 +56,17 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist}.js\?file=#{filename}">\s<\/script>/)
       end
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
 
     context "with variable gist id" do
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist_id}/raw").to_return(body: http_output) }
+      let(:gist_id)  { "1342013" }
       let(:gist)     { "page.gist_id" }
       let(:output) do
-        doc.data['gist_id'] = "1342013"
+        doc.data['gist_id'] = gist_id
         doc.content = content
         doc.output  = Jekyll::Renderer.new(doc.site, doc).run
       end
@@ -55,12 +74,18 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{doc.data['gist_id']}.js">\s<\/script>/)
       end
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
 
     context "with variable gist id and filename" do
-      let(:gist)     { "page.gist_id" }
-      let(:filename) { "page.gist_filename" }
-      let(:content)  { "{% gist #{gist} #{filename} %}" }
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist_id}/raw/#{gist_filename}").to_return(body: http_output) }
+      let(:gist_id)       { "1342013" }
+      let(:gist_filename) { "atom.xml" }
+      let(:gist)          { "page.gist_id" }
+      let(:filename)      { "page.gist_filename" }
+      let(:content)       { "{% gist #{gist} #{filename} %}" }
       let(:output) do
         doc.data['gist_id'] = "1342013"
         doc.data['gist_filename'] = "atom.xml"
@@ -71,7 +96,28 @@
       it "produces the correct script tag" do
         expect(output).to match(/<script src="https:\/\/gist.github.com\/#{doc.data['gist_id']}.js\?file=#{doc.data['gist_filename']}">\s<\/script>/)
       end
+
+      it "produces the correct noscript tag" do 
+        expect(output).to match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
     end
+
+    context "with valid gist id and invalid filename" do 
+      before { stub_request(:get, "https://gist.githubusercontent.com/#{gist_id}/raw/#{gist_filename}").to_return(status: 404) }
+      let(:gist_id)     { "mattr-/24081a1d93d2898ecf0f" }
+      let(:gist_filename) { "myfile.ext" }
+      let(:content)  { "{% gist #{gist_id} #{gist_filename} %}" }
+
+      it "produces the correct script tag" do
+        expect(output).to match(/<script src="https:\/\/gist.github.com\/#{gist_id}.js\?file=#{gist_filename}">\s<\/script>/)
+      end
+
+      it "does not produce the noscript tag" do 
+        expect(output).to_not match(/<noscript><pre>&lt;test&gt;true&lt;\/test&gt;<\/pre><\/noscript>\n/)
+      end
+
+    end
+
   end
 
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f15c3a8..6967f66 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,8 @@
 TEST_DIR = File.dirname(__FILE__)
 TMP_DIR  = File.expand_path("../tmp", TEST_DIR)
 
+require 'webmock/rspec'
+require 'cgi'
 require 'jekyll'
 require File.expand_path("../lib/jekyll-gist.rb", TEST_DIR)