diff --git a/Changes.txt b/Changes.txt
index dc507cc..c73a218 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -1,6 +1,6 @@
 FusionInventory Agent Windows Installer - History of Revisions and Changes
 
-2.3.18 (Not yet released)
+2.3.18 Sat, 18 Jun 2016
 agent:
 * FusionInventory Agent 2.3.18 (commit: b7c47ea3d5 | date: jun 16 2016)
 
diff --git a/NSIS/FusionInventory-Agent.nsi b/NSIS/FusionInventory-Agent.nsi
index 3ceb1ad..1b9121f 100644
--- a/NSIS/FusionInventory-Agent.nsi
+++ b/NSIS/FusionInventory-Agent.nsi
@@ -91,7 +91,7 @@ SetCompressor /FINAL /SOLID lzma
 
 ; Type of release of the agent
 ;    (Symbol:  PRODUCT_RELEASE_TYPE)
-!define PRODUCT_RELEASE_TYPE "candidate"
+!define PRODUCT_RELEASE_TYPE "stable"
 
 ; Check symbol PRODUCT_RELEASE_TYPE
 !define RELEASE_TYPE_STABLE "stable"
@@ -183,21 +183,21 @@ SetCompressor /FINAL /SOLID lzma
 !else
    !if "${PRODUCT_RELEASE_TYPE}" == "${RELEASE_TYPE_CANDIDATE}"
       ; Product version for candidate releases
-      !define PRODUCT_VERSION "2.3.18-rc6"
+      !define PRODUCT_VERSION "2.3.18-rc7"
 
       ; If PRODUCT_VERSION is a commit then
       ;    define the following symbols as empty string
       !define PRODUCT_VERSION_MAJOR "2"
       !define PRODUCT_VERSION_MINOR "3"
       !define PRODUCT_VERSION_RELEASE "18"
-      !define PRODUCT_VERSION_CANDIDATE "6"
+      !define PRODUCT_VERSION_CANDIDATE "7"
 
       ; File version
       ;    for Windows Version Information
       ;
       ; If PRODUCT_VERSION is a commit then
       ;    define the following symbols as '0.0.0.0'
-      !define FILE_VERSION "2.3.17.9906"
+      !define FILE_VERSION "2.3.17.9907"
 
    ; Bitmaps for stable releases
       ; Bitmaps for candidate releases
diff --git a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_en.md b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_en.md
index 202e66a..10ff414 100644
--- a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_en.md
+++ b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_en.md
@@ -1,7 +1,7 @@
 % FusionInventory Agent Windows Installer 2.3.18\
   User's Guide
 % Tomás Abad Gómez-Pastrana
-% Month Day, Year (Not yet released)
+% Jan 18, 2016
 
 ----------
 
diff --git a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_es.md b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_es.md
index de6dee9..6e5a04c 100644
--- a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_es.md
+++ b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_es.md
@@ -1,7 +1,7 @@
 % FusionInventory Agent Windows Installer 2.3.18\
   User's Guide
 % Tomás Abad Gómez-Pastrana
-% Month Day, Year (Not yet released)
+% Jun 18, 2016
 
 ----------
 
diff --git a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_fr.md b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_fr.md
index 31cd25c..a9fac11 100644
--- a/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_fr.md
+++ b/NSIS/FusionInventory-Agent/Doc/fusioninventory-agent_windows_installer_fr.md
@@ -1,7 +1,7 @@
 % FusionInventory Agent Windows Installer 2.3.18\
   User's Guide
 % Tomás Abad Gómez-Pastrana
-% Month Day, Year (Not yet released)
+% Jun 18, 2016
 
 ----------