diff --git a/doc/Makefile b/doc/Makefile
index 06a70519488e..afd3c781ebf9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -25,8 +25,8 @@ clean:
 	rm -rf ./out/ ./highlightjs
 
 .PHONY: validate
-validate: manual-full.xml
-	jing "$$RNG" manual-full.xml
+validate: manual-full.xml doc-support/result
+	jing doc-support/result/docbook.rng manual-full.xml
 
 out/html/index.html: manual-full.xml style.css highlightjs
 	mkdir -p out/html
diff --git a/doc/default.nix b/doc/default.nix
index 5cd91e0f1121..5a606981d8c2 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -15,7 +15,6 @@ in pkgs.stdenv.mkDerivation {
   # otherwise they won't reapply :)
   HIGHLIGHTJS = pkgs.documentation-highlighter;
   XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
-  RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
   XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix
index 94b3ea464d9f..6cf7666ccf8d 100644
--- a/doc/doc-support/default.nix
+++ b/doc/doc-support/default.nix
@@ -10,6 +10,9 @@ in pkgs.runCommand "doc-support" {}
     cd result
     ln -s ${locationsXml} ./function-locations.xml
     ln -s ${functionDocs} ./function-docs
+
+    ln -s ${pkgs.docbook5}/xml/rng/docbook/docbook.rng ./docbook.rng
+
     echo -n "${version}" > ./version
   )
   mv result $out