diff --git a/AUTHORS b/AUTHORS
index d66c4d54dc7..2cf48dd00f9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -453,6 +453,7 @@ Volodymyr Kochetkov
 Volodymyr Piskun
 Wei Lin
 Wil Cooley
+Will Riley
 William Lee
 Wim Glenn
 Wouter van Ackooy
diff --git a/CITATION b/CITATION
index d4e9d8ec7a1..98beee72209 100644
--- a/CITATION
+++ b/CITATION
@@ -1,16 +1,28 @@
 NOTE: Change "x.y" by the version you use. If you are unsure about which version
-you are using run: `pip show pytest`.
+you are using run: `pip show pytest`. Do not include the patch number (i.e., z in x.y.z)
 
 Text:
 
 [pytest] pytest x.y, 2004
 Krekel et al., https://github.com/pytest-dev/pytest
 
+BibLaTeX:
+
+@software{pytest,
+  title        = {pytest x.y},
+  author       = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
+  year         = {2004},
+  version      = {x.y},
+  url          = {https://github.com/pytest-dev/pytest},
+  note         = {Contributors: Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin and others}
+}
+
 BibTeX:
 
-@misc{pytestx.y,
-  title =        {pytest x.y},
-  author = {Krekel, Holger and Oliveira, Bruno and Pfannschmidt, Ronny and Bruynooghe, Floris and Laugher, Brianna and Bruhin, Florian},
-  year =         {2004},
-  url = {https://github.com/pytest-dev/pytest},
+@misc{pytest,
+  author       = {Holger Krekel and Bruno Oliveira and Ronny Pfannschmidt and Floris Bruynooghe and Brianna Laugher and Florian Bruhin},
+  title        = {pytest x.y},
+  year         = {2004},
+  howpublished = {\url{https://github.com/pytest-dev/pytest}},
+  note         = {Version x.y. Contributors include Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin, and others.}
 }
diff --git a/changelog/13415.improvement.rst b/changelog/13415.improvement.rst
new file mode 100644
index 00000000000..61667f15c7b
--- /dev/null
+++ b/changelog/13415.improvement.rst
@@ -0,0 +1,5 @@
+The author metadata of the BibTex example is now correctly formatted with last names following first names.
+An example of BibLaTex has been added.
+BibTex and BibLaTex examples now clearly indicate that what is cited is software.
+
+-- by :user:`willynilly`