diff --git a/docs/_plugins/javadoc_tag.rb b/docs/_plugins/javadoc_tag.rb
new file mode 100644
index 0000000000..14dd83b788
--- /dev/null
+++ b/docs/_plugins/javadoc_tag.rb
@@ -0,0 +1,131 @@
+# Tag to reference a javadoc page or package summary.
+#
+# * The tag "jdoc" is used for a type or member reference
+# * The tag "jdoc_package" is used for a package reference
+# * DO NOT confuse the two
+#
+# Usage (don't miss the DO NOT section at the bottom):
+#
+# * Simple type reference: {% jdoc core net.sourceforge.pmd.properties.PropertyDescriptor %}
+#   * First arg must be the name of the module, without the "pmd-" prefix, eg  "core" will be expanded to "pmd-core"
+#   * After a space, the fqcn of the type to reference is mentioned
+#   * This will be expanded to [`PropertyDescriptor`](https://javadoc.io/page/net.sourceforge.pmd/pmd-core/latest/net/sourceforge/pmd/properties/PropertyDescriptor.html)
+#     * Only the simple name of the type is visible by default
+#     * If you want to make the visible text expand to the FQCN like so [`net.sourceforge.pmd.properties.PropertyDescriptor`](...),
+#       then prefix the type name with a double bang (!!), e.g. {% jdoc core !!net.sourceforge.pmd.properties.PropertyDescriptor %}
+#
+# * Using context:
+#   * The variable javadoc_context may be used to shorten references
+#     * You can assign it like so:
+#       * {% assign javadoc_context = "core @.properties" %}
+#         * The "@" symbol in the initializer is expanded to "net.sourceforge.pmd"
+#         * So this assignment sets the context to pmd-core/net.sourceforge.pmd.properties
+#         * Then the symbol "@" in a javadoc tag will be expanded to "core net.sourceforge.pmd.properties"
+#         * E.g. the reference {% jdoc @.PropertyDescriptor %} is expanded to the same as {% jdoc core net.sourceforge.pmd.properties.PropertyDescriptor %}
+#         * Again, you may use "!!" to show the FQCN, like {% jdoc !!@.PropertyDescriptor %}
+#     * If the variable is not set, then "@" in a javadoc tag means "core net.sourceforge.pmd", eg
+#       {% jdoc @.properties.PropertyDescriptor %} works.
+#     * The artifact can be overridden from the context, eg with the default context "core net.sourceforge.pmd"
+#       {% jdoc java @.lang.java.JavaLanguageModule %} will be linked correctly to pmd-java, and @ will be expanded to
+#       "net.sourceforge.pmd"
+#
+# * To reference a method or field: {% jdoc core @.Rule#addRuleChainVisit(java.lang.Class) %}
+#   * The suffix # is followed by the name of the method
+#   * The (erased) types of method arguments must be fully qualified!! This is the same
+#   convention as in javadoc {@link} tags
+#
+# * To reference a package: {% jdoc_package @.properties %}, or {% jdoc-package @ %}
+#   * The "!!" is implicit, the full package name is always displayed
+#
+# * DO NOT:
+#   - Include spaces between dots, or anywhere except between the artifact reference and the page reference
+#   - Use double or single quotes around the arguments
+#   - Use the "#" suffix to reference a nested type, instead, use a dot "." and reference it like a normal type name
+#
+class JavadocTag < Liquid::Tag
+  def initialize(tag_name, doc_ref, tokens)
+    super
+
+    if %r/(\w+\s+)?(!!)?(@(?:\.\w+)*)(#.*)?/ =~ doc_ref
+
+      @artifact_name = $1 && ("pmd-" + $1.strip) # is nil if not mentioned
+      @show_full_name = !!$2
+      @type_fqcn = $3 # may be just "@"
+      @member_suffix = $4 || "" # default to empty string instead of nil
+
+    else
+      fail "Invalid javadoc reference format, see doc on javadoc_tag.rb"
+    end
+
+
+    if tag_name == "jdoc_package"
+      @is_package_ref = true
+      @show_full_name = true
+    end
+
+  end
+
+  def render(context)
+
+
+    doc_ctx = context["javadoc_context"] || "core net.sourceforge.pmd"
+    doc_ctx = doc_ctx.sub("@", "net.sourceforge.pmd") # Allows to use @ as shortcut when assigning javadoc_context
+    doc_ctx = doc_ctx.split(" ") # first is module, snd is package
+
+    p doc_ctx
+
+    if @type_fqcn.include?("@") # Expand using the context
+      if doc_ctx.length == 2 # if it's two words then the first is the module name
+        # if the artifact was mentioned in the tag, it takes precedence
+        @artifact_name = @artifact_name || ("pmd-" + doc_ctx.first)
+        @type_fqcn = @type_fqcn.sub("@", doc_ctx.last)
+      elsif doc_ctx.length == 1
+        p @type_fqcn
+        @type_fqcn = @type_fqcn.sub("@", doc_ctx.last)
+        p @type_fqcn
+      else
+        fail "Invalid javadoc context format (spaces), use either one word for a package prefix, or two words for module + package prefix"
+      end
+    end
+
+    unless @artifact_name
+      fail "No artifact id was mentioned either in the tag or in the context"
+    end
+
+
+    p @type_fqcn
+
+    if @show_full_name # !! was mentioned
+      visible_name = @type_fqcn
+    else
+      visible_name = @type_fqcn.split("\.").last # simple name
+    end
+
+
+    # Hack to reference the package summary
+    # Has to be done after finding the visible_name
+    if @is_package_ref
+      @type_fqcn = @type_fqcn + ".package-summary"
+    end
+
+
+    # Always hardcode the artifact version instead of using "latest"
+    api_version = context["site.pmd.version"]
+
+    markup_link(visible_name, doclink(@artifact_name, api_version, @type_fqcn, @member_suffix))
+  end
+
+  private
+
+  def doclink(artifact, api_version, type_name, member_suffix)
+    "https://javadoc.io/page/net.sourceforge.pmd/#{artifact}/#{api_version}/#{type_name.gsub("\.", "/")}.html#{member_suffix}"
+  end
+
+  def markup_link(rname, link)
+    "[`#{rname}`](#{link})"
+  end
+
+end
+
+Liquid::Template.register_tag('jdoc', JavadocTag)
+Liquid::Template.register_tag('jdoc_package', JavadocTag)
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 5baf27eb74..0a66b9d727 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -32,9 +32,10 @@ This is a {{ site.pmd.release_type }} release.
     *   [#1372](https://github.com/pmd/pmd/issues/1372): \[java] false positive for UselessQualifiedThis
 
 ### API Changes
+{% assign javadoc_context = "core @.lang.ast.xpath" %}
 
-* The implementation of the adapters for the XPath engines Saxon and Jaxen (package `net.sourceforge.pmd.lang.ast.xpath`)
-  are now deprecated. They'll be moved to an internal package come 7.0.0. Only `Attribute` remains public API.
+* The implementation of the adapters for the XPath engines Saxon and Jaxen (package {% jdoc_package @ %})
+  are now deprecated. They'll be moved to an internal package come 7.0.0. Only {% jdoc @.Attribute %} remains public API.
 
 ### External Contributions