diff --git a/CHANGELOG.md b/CHANGELOG.md
index d50a943..8070425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2018-nov-15 (v2.5)
+* Implements CRLF as newlines in the credentials file when the client is on Windows. Fixes [#21](https://github.com/prolane/samltoawsstskeys/issues/21)
+* Removes unnecessary spaces prior the newlines in credentials file. Fixes [#14](https://github.com/prolane/samltoawsstskeys/issues/14)
+
 ## 2018-aug-2 (v2.4)
 * Bug fix for users with one IAM role in the SAML claim. Bug was introduced with release 2.1, but according to user reports only results in an error starting with Chrome release 68.
 
diff --git a/manifest.json b/manifest.json
index 6c269ce..b50baeb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
   "homepage_url": "https://github.com/prolane/samltoawsstskeys",
   "name": "SAML to AWS STS Keys Conversion",
   "description": "Generates file with AWS STS Keys after logging in to AWS webconsole using SSO (SAML 2.0). It leverages 'assumeRoleWithSAML' API.",
-  "version": "2.4",
+  "version": "2.5",
   "icons": {  "16": "icons/icon_16.png",
               "32": "icons/icon_32.png",
               "48": "icons/icon_48.png",
diff --git a/options/changelog.html b/options/changelog.html
index 5388c8a..0adb194 100644
--- a/options/changelog.html
+++ b/options/changelog.html
@@ -20,6 +20,14 @@
 	<hr>
 	
 	<div id="divChangelog">
+		<h3>2018-nov-15<br>v2.5</h3>
+		<ul>
+			<li>Implements CRLF as newlines in the credentials file when the client is on Windows. Fixes <a href="https://github.com/prolane/samltoawsstskeys/issues/21" target="_blank">#21</a></li>
+			<li>Removes unnecessary spaces prior the newlines in credentials file. Fixes <a href="https://github.com/prolane/samltoawsstskeys/issues/14" target="_blank">#14</a></li>
+		</ul>
+		<br />
+		<br />
+
 		<h3>2018-aug-2<br>v2.4</h3>
 		<ul>
 			<li>Bug fix for users with one IAM role in the SAML claim. Bug was introduced with release 2.1, but according to user reports only results in an error starting with Chrome release 68.</li>