diff --git a/rdesktop.c b/rdesktop.c
index 19c6535..cd1b51a 100644
--- a/rdesktop.c
+++ b/rdesktop.c
@@ -1565,8 +1565,8 @@ mkdir_p(const char *path, int mask)
 int
 load_licence(unsigned char **data)
 {
-	uint8 ho[16], hi[16];
-	char *home, path[PATH_MAX], hash[33];
+	uint8 ho[20], hi[16];
+	char *home, path[PATH_MAX], hash[40];
 	struct stat st;
 	int fd, length;
 
@@ -1576,7 +1576,7 @@ load_licence(unsigned char **data)
 
 	snprintf((char*)hi, 16, g_hostname);
 	sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16);
-	sec_hash_to_string(hash, 33, ho, 16);
+	sec_hash_to_string(hash, 40, ho, 22);
 
 	snprintf(path, PATH_MAX, "%s"RDESKTOP_LICENSE_STORE"/%s.cal", 
 		 home, hash);
@@ -1608,8 +1608,8 @@ load_licence(unsigned char **data)
 void
 save_licence(unsigned char *data, int length)
 {
-	uint8 ho[16], hi[16];
-	char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[33];
+	uint8 ho[20], hi[16];
+	char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[40];
 	int fd;
 
 	home = getenv("HOME");
@@ -1626,7 +1626,7 @@ save_licence(unsigned char *data, int length)
 
 	snprintf((char*)hi,16,g_hostname);
 	sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16);
-	sec_hash_to_string(hash, 33, ho, 16);
+	sec_hash_to_string(hash, 40, ho, 20);
 
 	/* write licence to {sha1}.cal.new, then atomically 
 	   rename to {sha1}.cal */