diff --git a/_plugins/fetch_remote.rb b/_plugins/fetch_remote.rb
index 9c1cdbff008b..2edb734bac6d 100644
--- a/_plugins/fetch_remote.rb
+++ b/_plugins/fetch_remote.rb
@@ -49,14 +49,6 @@ def pre_read(site)
         end
       end
 
-      Jekyll.logger.info "  Fixing up URLs in swagger files"
-      Dir.glob("./engine/api/*.yaml") do |file_name|
-        Jekyll.logger.info "    #{file_name}"
-        text = File.read(file_name)
-        replace = text.gsub!("https://docs.docker.com/", "")
-        File.open(file_name, "w") { |file| file.puts replace }
-      end
-
       end_time = Time.now
       Jekyll.logger.info "done in #{(end_time - beginning_time)} seconds"
     end
diff --git a/_plugins/fix_urls.rb b/_plugins/fix_urls.rb
new file mode 100644
index 000000000000..09ac25af690c
--- /dev/null
+++ b/_plugins/fix_urls.rb
@@ -0,0 +1,24 @@
+require 'jekyll'
+require 'octopress-hooks'
+
+module Jekyll
+
+  class FetchRemote < Octopress::Hooks::Site
+    def post_read(site)
+      beginning_time = Time.now
+      Jekyll.logger.info "Starting plugin fix_urls.rb..."
+
+      Jekyll.logger.info "  Fixing up URLs in swagger files"
+      Dir.glob(%w[./docker-hub/api/*.yaml ./engine/api/*.yaml]) do |file_name|
+        Jekyll.logger.info "    #{file_name}"
+        text = File.read(file_name)
+        replace = text.gsub!("https://docs.docker.com", "")
+        File.open(file_name, "w") { |file| file.puts replace }
+      end
+
+      end_time = Time.now
+      Jekyll.logger.info "done in #{(end_time - beginning_time)} seconds"
+    end
+  end
+
+end