diff --git a/README.Rmd b/README.Rmd
index 956091b..798ec3e 100755
--- a/README.Rmd
+++ b/README.Rmd
@@ -88,8 +88,11 @@ Contributions are very welcome:
 ### Acknowledgements
 
 **Kindly cite this work** as follows: 
-[Markus Kainu](https://github.com/muuankarski), [Joona Lehtomäki](https://github.com/jlehtoma), Juuso Parkkinen, Jani Miettinen, Pyry Kantanen, [Leo Lahti](https://github.com/antagomir)
-Retrieval and analysis of open geospatial data from Finland with the geofi R package. R package version `r sessionInfo()$otherPkgs$geofi$Version`. URL: [https://ropengov.github.io/geofi/](https://ropengov.github.io/geofi/)
+
+```{r, comment = "", highlight=FALSE}
+citation("geofi")
+
+```
 
 We are grateful to all [contributors](https://github.com/rOpenGov/geofi/graphs/contributors). This project is part of [rOpenGov](https://ropengov.org).
 
diff --git a/README.md b/README.md
index 59ad99a..9650fb2 100644
--- a/README.md
+++ b/README.md
@@ -89,13 +89,34 @@ Contributions are very welcome:
 
 ### Acknowledgements
 
-**Kindly cite this work** as follows: [Markus
-Kainu](https://github.com/muuankarski), [Joona
-Lehtomäki](https://github.com/jlehtoma), Juuso Parkkinen, Jani
-Miettinen, Pyry Kantanen, [Leo Lahti](https://github.com/antagomir)
-Retrieval and analysis of open geospatial data from Finland with the
-geofi R package. R package version 1.0.18. URL:
-<https://ropengov.github.io/geofi/>
+**Kindly cite this work** as follows:
+
+``` text
+citation("geofi")
+Kindly cite the geofi R package as follows:
+
+To cite 'geofi' in publications use:
+
+  Kainu M, Lehtomaki J, Parkkinen J, Miettinen J, Kantanen P, Vesanen
+  S, Lahti L (2025). geofi: Access Finnish Geospatial Data.
+  doi:10.32614/CRAN.package.geofi, R package version 1.0.18, URL:
+  https://github.com/rOpenGov/geofi
+
+A BibTeX entry for LaTeX users is
+
+  @Manual{R-geofi,
+    title = {{geofi: Access Finnish Geospatial Data}},
+    doi = {10.32614/CRAN.package.geofi},
+    author = {Markus Kainu and Joona Lehtomaki and Juuso Parkkinen and Jani Miettinen and Pyry Kantanen and Sampo Vesanen and Leo Lahti},
+    year = {2025},
+    version = {1.0.18},
+    note = {R package version 1.0.18},
+    url = {https://github.com/rOpenGov/geofi},
+  }
+
+Many thanks for all contributors! For more info, see:
+https://github.com/rOpenGov/geofi
+```
 
 We are grateful to all
 [contributors](https://github.com/rOpenGov/geofi/graphs/contributors).
diff --git a/inst/CITATION b/inst/CITATION
index ca6f6e6..52819ad 100755
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -1,8 +1,15 @@
+year <- sub("-.*", "", meta$Date)
+version_note <- paste("R package version", meta$Version)
+pkg <- meta$Package
+title <- gsub("'", "", meta$Title)
+doi <- paste0("10.32614/CRAN.package.", pkg)
+
 citHeader("Kindly cite the geofi R package as follows:")
 
 bibentry(bibtype = "Manual",
-         header = "To cite package ‘geofi’ in publications use:",
-         title = "geofi: Access Finnish Geospatial Data",
+         header = sprintf("To cite '%s' in publications use:", pkg),
+         title = sprintf("{%s: %s}", pkg, title),
+         doi = "10.32614/CRAN.package.geofi",
          author = c(
                     person("Markus", "Kainu", , "markus.kainu@kapsi.fi", role = c("aut", "cre"),
                            comment = c(ORCID = "0000-0003-1376-503X")),
@@ -11,18 +18,17 @@ bibentry(bibtype = "Manual",
                     person("Juuso", "Parkkinen", role = "ctb",
                            comment = c(ORCID = "0000-0002-7818-5901")),
                     person("Jani", "Miettinen", role = "ctb"),
-                    person("Pyry", "Kantanen", role = "ctb"),
+                    person("Pyry", "Kantanen", role = "ctb", 
+                           comment = c(ORCID = "0000-0003-2853-2765")),
                     person("Sampo", "Vesanen", role = "ctb"),
                     person("Leo", "Lahti", , "leo.lahti@iki.fi", role = "aut",
                            comment = c(ORCID = "0000-0001-5537-637X"))
                   ),
-         year = "2023",
-         note = "R package version 1.0.8",
+         year = year,
+         version = meta$Version,
+         note = version_note,
          url = "https://github.com/rOpenGov/geofi",
-         textVersion =
-         paste("(C) Markus Kainu, Joona Lehtomaki, Juuso Parkkinen, Jani Miettinen, Pyry Kantanen, Sampo Vesanen, Leo Lahti 2015-2023.",
-               "geofi: Access Finnish Geospatial Data, <doi:10.5281/zenodo.7148138>",
-               sep=" ")
+         key = paste0("R-", pkg)
          )
 
 
diff --git a/man/figures/readme_map-1.png b/man/figures/readme_map-1.png
index 7d5c5a5..b9e6776 100644
Binary files a/man/figures/readme_map-1.png and b/man/figures/readme_map-1.png differ