diff --git a/ChangeLog b/ChangeLog
index d52081ef..c102ba84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in HQApi 6.0.2
+ *) [HHQ-5972] I18N:Non-ASCII user name cannot connect via HQAPI
+
 Changes in HQApi 6.0.1
  *) [HQ-4531] Added policy permissions to available operations for roles
 
diff --git a/README b/README
index 39ea9d6c..fb570860 100644
--- a/README
+++ b/README
@@ -9,6 +9,7 @@ http://hudson.hyperic.com/
 
 Version compatibility guide:
 
+HQApi 6.0.2 -> HQ 5.8.1
 HQApi 6.0.1 -> HQ 5.8
 HQApi 5.x -> HQ 4.6
 HQApi 4.x -> HQ 4.5
diff --git a/hqapi1-client/pom.xml b/hqapi1-client/pom.xml
index 832e3c95..fda446fd 100644
--- a/hqapi1-client/pom.xml
+++ b/hqapi1-client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hyperic.hq.hqapi</groupId>
 		<artifactId>parent</artifactId>
-		<version>6.0.1</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>hqapi1-client</artifactId>
diff --git a/hqapi1-integration-tests/pom.xml b/hqapi1-integration-tests/pom.xml
index b194067b..29211a91 100644
--- a/hqapi1-integration-tests/pom.xml
+++ b/hqapi1-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hyperic.hq.hqapi</groupId>
 		<artifactId>parent</artifactId>
-		<version>6.0.1</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>hqapi1-integration-tests</artifactId>
diff --git a/hqapi1-plugin/pom.xml b/hqapi1-plugin/pom.xml
index 4fb58e89..ae15bb73 100644
--- a/hqapi1-plugin/pom.xml
+++ b/hqapi1-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hyperic.hq.hqapi</groupId>
 		<artifactId>parent</artifactId>
-		<version>6.0.1</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>hqapi1-plugin</artifactId>
diff --git a/hqapi1-tools/pom.xml b/hqapi1-tools/pom.xml
index 69cad5e8..4830d2f0 100644
--- a/hqapi1-tools/pom.xml
+++ b/hqapi1-tools/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.hyperic.hq.hqapi</groupId>
 		<artifactId>parent</artifactId>
-		<version>6.0.1</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>hqapi1-tools</artifactId>
diff --git a/hqapi1/pom.xml b/hqapi1/pom.xml
index fd6c97ef..c97b7740 100644
--- a/hqapi1/pom.xml
+++ b/hqapi1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.hyperic.hq.hqapi</groupId>
         <artifactId>parent</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
     </parent>
 
     <artifactId>hqapi1</artifactId>
diff --git a/hqapi1/src/main/java/org/hyperic/hq/hqapi1/HQConnection.java b/hqapi1/src/main/java/org/hyperic/hq/hqapi1/HQConnection.java
index 06002c40..8b4ac9ba 100644
--- a/hqapi1/src/main/java/org/hyperic/hq/hqapi1/HQConnection.java
+++ b/hqapi1/src/main/java/org/hyperic/hq/hqapi1/HQConnection.java
@@ -58,6 +58,7 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.auth.params.AuthPNames;
 import org.apache.http.client.AuthCache;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -376,6 +377,8 @@ private <T> T runMethod(HttpRequestBase method, String uri, ResponseHandler<T> r
         localContext.setAttribute(ClientContext.AUTH_CACHE, authCache);        
 
         method.getParams().setParameter(ClientPNames.HANDLE_AUTHENTICATION, true);
+        
+        method.getParams().setParameter(AuthPNames.CREDENTIAL_CHARSET, "UTF-8");
 
         // Disable re-tries
         client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, true));
diff --git a/pom.xml b/pom.xml
index 547a8ed7..21a826f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.hyperic.hq.hqapi</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <name>Hyperic HQAPI - Parent</name>
 
     <properties>