diff --git a/CITATION.cff b/CITATION.cff
index bb9c7e8d6..c63bd9efe 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -7,6 +7,7 @@ authors:
   given-names: Sameer
 - family-names: Mierle
   given-names: Keir
+- name: The Ceres Solver Team
 version: 2.1
 date-released: 2022-03-28
 license: Apache-2.0
diff --git a/docs/source/index.rst b/docs/source/index.rst
index d72368f18..51763d15e 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -44,12 +44,15 @@ Cite Us
 
 If you use Ceres Solver for a publication, please cite it as::
 
-    @misc{ceres-solver,
-      author = "Sameer Agarwal and Keir Mierle and Others",
-      title = "Ceres Solver",
-      howpublished = "\url{http://ceres-solver.org}",
-    }
-
+  @software{Agarwal_Ceres_Solver_2022,
+    author = {Agarwal, Sameer and Mierle, Keir and The Ceres Solver Team},
+    title = {{Ceres Solver}},
+    license = {Apache-2.0},
+    url = {https://github.com/ceres-solver/ceres-solver},
+    version = {2.1},
+    year = {2022},
+    month = {3}
+  }
 
 .. rubric:: Footnotes