diff --git a/build.xml b/build.xml
index 04a693447..79c3bb727 100755
--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="home" value="."/>
-  <property name="version" value="18.7.0"/>
+  <property name="version" value="18.8.0"/>
   <property name="noelf" value="true"/>
 
   <property name="debian.depends" value="default-jre-headless, libjsch-java, libjzlib-java, libjcifs-java, libv4l-0, desktop-file-utils"/>
diff --git a/projects/jfpasswords/build.xml b/projects/jfpasswords/build.xml
index 18ad6c0ec..52b84f987 100755
--- a/projects/jfpasswords/build.xml
+++ b/projects/jfpasswords/build.xml
@@ -7,7 +7,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.20"/>
+  <property name="version" value="0.21"/>
 
   <import file="../../base.xml"/>
 
diff --git a/projects/jfpasswords/readme.txt b/projects/jfpasswords/readme.txt
index f26d4d72b..425d7f5eb 100755
--- a/projects/jfpasswords/readme.txt
+++ b/projects/jfpasswords/readme.txt
@@ -6,4 +6,5 @@ Can Import KeyPass2 files.
 
 Website : http://jfpasswords.sf.net
 
-Source : http://javaforce.sf.net
+Source : https://github.com/pquiring/javaforce/tree/master/projects/jfpasswords
+
diff --git a/projects/jfpasswords/src/PasswordsApp.java b/projects/jfpasswords/src/PasswordsApp.java
index 4b72fd69e..78e68abe0 100755
--- a/projects/jfpasswords/src/PasswordsApp.java
+++ b/projects/jfpasswords/src/PasswordsApp.java
@@ -11,7 +11,7 @@
 
 public class PasswordsApp extends javax.swing.JFrame implements ActionListener {
 
-  private String version = "0.20";
+  private String version = "0.21";
 
   /**
    * Creates new form PasswordsApp
diff --git a/projects/jfpasswords/whatsnew.txt b/projects/jfpasswords/whatsnew.txt
new file mode 100644
index 000000000..73b30c62f
--- /dev/null
+++ b/projects/jfpasswords/whatsnew.txt
@@ -0,0 +1,40 @@
+Dec 30/2019 : jfPasswords/0.21 released
+  - fix : support UTF-8
+
+Jan 24/2019 : jfpasswords/0.20 released
+  - added OpenSite and Help buttons
+
+Sept 26/2018 : jfPasswords/0.19 released
+  - add JRE to MSI package
+
+Oct 18/2017 : jfPasswords/0.17 released
+  - Java9 support
+
+Dec 17/2015 : jfPasswords/0.16 released
+  - added 'avoid ambiguous chars' option
+
+Dec 17/2015 : jfPasswords/0.15 released
+  - changed startup behaviour (do not show window on startup)
+
+Jul 9/2015 : jfPasswords/0.14 released
+  - fixed drag and drop entries between groups
+
+Sept 15/2014 : jfPasswords/0.12 released
+  - tray icon is now scaled to correct size (must call SystemTray.getTrayIconSize() to get OS specific size)
+  - new tray icons that matches Windows 7 theme
+
+Jun 23/2014 : jfPasswords/0.10 released
+  - fix : now shows Window regardless of if it's minimized, not in front or closed.
+
+May 22/2014 : jfPasswords/0.9 released
+  - now checks if safe file has changed when main window is shown and asks to reload if so
+
+Nov 30/2013 : jfPasswords/0.8 released
+  - now re-asks for password to show window (more secure)
+
+Nov 21/2013 : jfPasswords/0.7 released
+  - app now includes a tray icon for easy access
+
+Nov 14/2013 : jfPasswords/0.6 released
+  - added CTRL+Z to copy username and other minor bugs
+
diff --git a/projects/jfpasswords/wix64.xml b/projects/jfpasswords/wix64.xml
index 6f34f1410..16bbeef57 100755
--- a/projects/jfpasswords/wix64.xml
+++ b/projects/jfpasswords/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{2DE2BA57-E4DA-4F80-BF66-4A9E55476F42}" Version="0.20" Language="1033" Name="jfPasswords" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{2DE2BA57-E4DA-4F80-BF66-4A9E55476F42}" Version="0.21" Language="1033" Name="jfPasswords" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />
diff --git a/readme.txt b/readme.txt
index 34fc95f49..f8f627ccc 100755
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 JavaForce SDK
 =============
 
-Version 18.7.0
+Version 18.8.0
 
 What is it?
 ===========
@@ -122,4 +122,4 @@ Web : pquiring.github.io/javaforce
 
 Git : github.com/pquiring/javaforce
 
-Released : Dec 29, 2019
+Released : Dec 30, 2019
diff --git a/src/javaforce/JF.java b/src/javaforce/JF.java
index e8a8da838..6220debfc 100755
--- a/src/javaforce/JF.java
+++ b/src/javaforce/JF.java
@@ -18,7 +18,7 @@
 public class JF {
 
   public static String getVersion() {
-    return "18.7.0";
+    return "18.8.0";
   }
 
   public static void sleep(int milli) {
diff --git a/whatsnew.txt b/whatsnew.txt
index 4c3b6af77..988964735 100755
--- a/whatsnew.txt
+++ b/whatsnew.txt
@@ -1,5 +1,10 @@
 What's new...
 
+Dec 30/2019 : JF 18.8.0 released
+  - XML loader now supports UTF-8
+  - jfPasswords/0.21
+    - fix : support UTF-8
+
 Dec 29/2019 : JF 18.7.0 released
   - jfBackup/0.8
     - fix : reset tape used at start of backup