diff --git a/DESCRIPTION b/DESCRIPTION
index 411cedd3d032d9f8652456a674bd7bbdb3e7d9e7..3ab488ad6872d749115a204a3c2e9ecf2754e93a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.6.17
-Date: 2017-04-11
+Version: 1.0.6.18
+Date: 2017-05-22
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl")),
   person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/inst/CITATION b/inst/CITATION
index 38e7b29489236ce27089ce00eefaea2999156966..c1a5d9c80a20db4f64223639e615c0ee1950f366 100644
--- a/inst/CITATION
+++ b/inst/CITATION
@@ -6,30 +6,35 @@ note    <- sprintf("R package version %s", version)
 citHeader("To cite airGR in publications use these two references:")
 
 bibentry(bibtype="Article",
-	title = "The Suite of Lumped GR Hydrological Models in an R package",
-    author = personList(as.person("L. Coron"), as.person("G. Thirel"), as.person("O. Delaigue"), as.person("C. Perrin"), as.person("V. Andréassian")),
-	journal = "Environmental Modelling and Software",
-  	year = "submitted",       
-        textVersion = 
-        paste("Coron, L., Thirel, G., Delaigue, O., Perrin, C. and Andréassian, V.",
-	          "(submitted).", 
-              "The Suite of Lumped GR Hydrological Models in an R package.",
-              "Environmental Modelling and Software.",
-              sep = " ")
-         )
+         title = "The Suite of Lumped {GR} Hydrological Models in an {R} package",
+         author = personList(as.person("L. Coron"), as.person("G. Thirel"), as.person("O. Delaigue"), as.person("C. Perrin"), as.person("V. Andréassian")),
+         journal = "Environmental Modelling and Software",
+         year = "2017",
+         pages = {166--171},
+         volume = {94},
+         doi = "10.1016/j.envsoft.2017.05.002",
+         textVersion = 
+           paste("Coron, L., Thirel, G., Delaigue, O., Perrin, C. and Andréassian, V.",
+                 "(2017).", 
+                 "The Suite of Lumped GR Hydrological Models in an R package.",
+                 "Environmental Modelling and Software,",
+                 "94, 432-440.",
+                 "DOI: 10.1016/j.envsoft.2017.05.002.",
+                 sep = " ")
+)
 
 bibentry(bibtype="Manual",
-	title = "airGR: Suite of GR Hydrological Models for Precipitation-Runoff Modelling",
-    author = personList(as.person("L. Coron"), as.person("C. Perrin"), as.person("C. Michel")),
-	journal = "R News",
-  	year = year,
-    note = note,
-    url = "https://webgr.irstea.fr/airGR/?lang=en",
-        textVersion = 
-        paste("Coron, L., Perrin, C. and Michel, C.",
-			  year,
-              "airGR: Suite of GR Hydrological Models for Precipitation-Runoff Modelling.",
-              note,
-              "https://webgr.irstea.fr/airGR/?lang=en.",
-              sep = " ")
-         )
+         title = "{airGR}: Suite of {GR} Hydrological Models for Precipitation-Runoff Modelling",
+         author = personList(as.person("L. Coron"), as.person("C. Perrin"), as.person("C. Michel")),
+         journal = "R News",
+         year = year,
+         note = note,
+         url = "https://webgr.irstea.fr/airGR/?lang=en",
+         textVersion = 
+           paste0("Coron, L., Perrin, C. and Michel, C. (",
+                  year,
+                  "). airGR: Suite of GR Hydrological Models for Precipitation-Runoff Modelling. ",
+                  note,
+                  ". URL: https://webgr.irstea.fr/airGR/."
+                  )
+)