diff --git a/lib/arch/CArchFileUnix.cpp b/lib/arch/CArchFileUnix.cpp
index a708cc8d..dc4cc3b8 100644
--- a/lib/arch/CArchFileUnix.cpp
+++ b/lib/arch/CArchFileUnix.cpp
@@ -56,6 +56,9 @@ CArchFileUnix::getUserDirectory()
 	struct passwd* pwentp;
 #if defined(_SC_GETPW_R_SIZE_MAX)
 	long size = sysconf(_SC_GETPW_R_SIZE_MAX);
+	if (size == -1) {
+		size = BUFSIZ;
+	}
 #else
 	long size = BUFSIZ;
 #endif
diff --git a/lib/platform/CMSWindowsKeyMapper.cpp b/lib/platform/CMSWindowsKeyMapper.cpp
index ac77cc95..dbd981e2 100644
--- a/lib/platform/CMSWindowsKeyMapper.cpp
+++ b/lib/platform/CMSWindowsKeyMapper.cpp
@@ -345,7 +345,7 @@ const KeyID				CMSWindowsKeyMapper::s_virtualKey[][2] =
 	/* 0x16 */ kKeyNone,		kKeyNone,		// VK_HANGUL		
 	/* 0x17 */ kKeyNone,		kKeyNone,		// VK_JUNJA			
 	/* 0x18 */ kKeyNone,		kKeyNone,		// VK_FINAL			
-	/* 0x19 */ kKeyNone,		kKeyNone,		// VK_KANJI			
+	/* 0x19 */ kKeyZenkaku,		kKeyNone,		// VK_KANJI			
 	/* 0x1a */ kKeyNone,		kKeyNone,		// undefined
 	/* 0x1b */ kKeyEscape,		kKeyNone,		// VK_ESCAPE
 	/* 0x1c */ kKeyNone,		kKeyNone,		// VK_CONVERT		
@@ -668,7 +668,7 @@ const KeyButton			CMSWindowsKeyMapper::s_mapEF00[] =
 	/* 0x10 */ 0, 0, 0, VK_PAUSE, VK_SCROLL, 0/*sys-req*/, 0, 0,
 	/* 0x18 */ 0, 0, 0, VK_ESCAPE, 0, 0, 0, 0,
 	/* 0x20 */ 0, 0, 0, 0, 0, 0, 0, 0,
-	/* 0x28 */ 0, 0, 0, 0, 0, 0, 0, 0,
+	/* 0x28 */ 0, 0, VK_KANJI, 0, 0, 0, 0, 0,
 	/* 0x30 */ 0, 0, 0, 0, 0, 0, 0, 0,
 	/* 0x38 */ 0, 0, 0, 0, 0, 0, 0, 0,
 	/* 0x40 */ 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/lib/synergy/KeyTypes.h b/lib/synergy/KeyTypes.h
index 9af4dd0b..687408be 100644
--- a/lib/synergy/KeyTypes.h
+++ b/lib/synergy/KeyTypes.h
@@ -86,6 +86,7 @@ static const KeyID		kKeyPause		= 0xEF13;	/* Pause, hold */
 static const KeyID		kKeyScrollLock	= 0xEF14;
 static const KeyID		kKeySysReq		= 0xEF15;
 static const KeyID		kKeyEscape		= 0xEF1B;
+static const KeyID		kKeyZenkaku		= 0xEF2A;	/* Zenkaku/Hankaku */
 static const KeyID		kKeyDelete		= 0xEFFF;	/* Delete, rubout */
 
 // multi-key character composition