diff --git a/README.Rmd b/README.Rmd
index eca2bf36..bd5a1ab1 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -38,7 +38,7 @@ results](https://badges.cranchecks.info/worst/nominatimlite.svg)](https://cran.r
 [![Project Status: Active -- The project has reached a stable, usable state and
 is being actively
 developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-[![DOI](https://img.shields.io/badge/DOI-10.5281/zenodo.5113195-blue)](https://doi.org/10.5281/zenodo.5113195)
+[![DOI](https://img.shields.io/badge/DOI-10.32614/CRAN.package.nominatimlite-blue)](https://doi.org/10.32614/CRAN.package.nominatimlite)
 [![status](https://tinyverse.netlify.app/status/nominatimlite)](https://CRAN.R-project.org/package=nominatimlite)
 
 <!-- badges: end -->
diff --git a/inst/CITATION b/inst/CITATION
index 2ccb24f4..4a2dbc63 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -1,20 +1,22 @@
 year <- format(Sys.time(), "%Y")
 abs <- trimws(gsub("\\s+", " ", meta$Description))
 abs <- gsub("'", "", abs)
-doi <- "10.5281/zenodo.5113195"
 title <- gsub("'", "", meta$Title, fixed = TRUE)
 title <- gsub("Nominatim", "{Nominatim}", title, fixed = TRUE)
 title <- gsub("API", "{API}", title, fixed = TRUE)
+pkg <- trimws(meta$Package)
+doi <- paste0("10.32614/CRAN.package.", pkg)
 
 bibentry(
   "Manual",
-  header = "To cite the 'nominatimlite' package in publications use:",
-  title = paste("{nominatimlite}:", title),
-  author = person("Diego", "Hernangómez"),
+  header = paste0("To cite '", pkg, "' in publications use:"),
+  title = paste0("{", pkg, "}: ", gsub("'", "", title)),
+  doi = doi,
+  author = c(person("Diego", "Hernangómez")),
   year = year,
-  key = "R-nominatimlite",
   version = meta$Version,
-  doi = doi,
   url = unlist(strsplit(meta$URL, ","))[1],
-  abstract = abs
+  abstract = abs,
+  key = paste0("R-", pkg)
 )
+