diff --git a/ChangeLog b/ChangeLog
index 139ff24..4b7a47a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-13  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/win32/WIN32Server.m (process_char):
+	Fix bug that caused F11 keypresses to become F12.
+	Patch by Adam Fox <adam.fox@testplant.com>
+
 2015-06-05  Fred Kiefer <FredKiefer@gmx.de>
 
         * configure.ac: Fix configure for mingw
diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m
index 61fc97b..6b53c63 100644
--- a/Source/win32/WIN32Server.m
+++ b/Source/win32/WIN32Server.m
@@ -2467,7 +2467,7 @@ process_char(WPARAM wParam, unsigned *eventModifierFlags)
       case VK_F8: WIN_FUNCTIONKEY return NSF8FunctionKey;
       case VK_F9: WIN_FUNCTIONKEY return NSF9FunctionKey;
       case VK_F10: WIN_FUNCTIONKEY return NSF10FunctionKey;
-      case VK_F11: WIN_FUNCTIONKEY return NSF12FunctionKey;
+      case VK_F11: WIN_FUNCTIONKEY return NSF11FunctionKey;
       case VK_F12: WIN_FUNCTIONKEY return NSF12FunctionKey;
       case VK_F13: WIN_FUNCTIONKEY return NSF13FunctionKey;
       case VK_F14: WIN_FUNCTIONKEY return NSF14FunctionKey;