diff --git a/docs/static/include/pluginbody.asciidoc b/docs/static/include/pluginbody.asciidoc
index 8e6c81029..ae0d88a15 100644
--- a/docs/static/include/pluginbody.asciidoc
+++ b/docs/static/include/pluginbody.asciidoc
@@ -894,12 +894,10 @@ file at http://mvnrepository.com and download the specified version.
 ==== Document your plugin
 Documentation is an important part of your plugin. All plugin documentation is
 rendered and placed in the 
-http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash
-Reference] and the {lsplugindocs}[Versioned plugin docs].
+{logstash-ref}[Logstash Reference] and the {lsplugindocs}[Versioned plugin docs].
 
 See <<plugin-doc>> for tips and guidelines.
 
-
 ==== Add Tests
 
 Logstash loves tests. Lots of tests. If you're using your new {plugintype}
@@ -1241,10 +1239,10 @@ we always welcome new plugins!
 Some of the many benefits of having your plugin in the logstash-plugins
 repository are:
 
-* **Discovery.** Your plugin will appear in the http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference],
+* **Discovery.** Your plugin will appear in the {logstash-ref}[Logstash Reference],
 where Logstash users look first for plugins and documentation.
 * **Documentation.** Your plugin documentation will automatically be added to the
- http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference].
+{logstash-ref}[Logstash Reference].
 * **Testing.** With our testing infrastructure, your plugin will be continuously
 tested against current and future releases of Logstash.  As a result, users will
 have the assurance that if incompatibilities arise, they will be quickly
diff --git a/docs/static/submitting-a-plugin.asciidoc b/docs/static/submitting-a-plugin.asciidoc
index 8de77da37..1a9030aab 100644
--- a/docs/static/submitting-a-plugin.asciidoc
+++ b/docs/static/submitting-a-plugin.asciidoc
@@ -79,10 +79,10 @@ we always welcome new plugins!
 Some of the many benefits of having your plugin in the logstash-plugins
 repository are:
 
-* **Discovery** Your plugin will appear in the http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference],
+* **Discovery** Your plugin will appear in the {logstash-ref}[Logstash Reference],
 where Logstash users look first for plugins and documentation.
-* **Documentation** Your plugin documentation will automatically be added to the
- http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference].
+* **Documentation** Your plugin documentation will automatically be added to the 
+{logstash-ref}[Logstash Reference].
 * **Testing** With our testing infrastructure, your plugin will be continuously
 tested against current and future releases of Logstash.  As a result, users will
 have the assurance that if incompatibilities arise, they will be quickly