diff --git a/src/java/org/lwjgl/opengl/KeyboardEventQueue.java b/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
index 8063cae0..c4cdc3d5 100644
--- a/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
+++ b/src/java/org/lwjgl/opengl/KeyboardEventQueue.java
@@ -335,9 +335,9 @@ final class KeyboardEventQueue extends EventQueue implements KeyListener {
 					return Keyboard.KEY_LMENU;
 			case KeyEvent.VK_META:
 				if (position == KeyEvent.KEY_LOCATION_RIGHT)
-					return Keyboard.KEY_RWIN;
+					return Keyboard.KEY_RMETA;
 				else
-					return Keyboard.KEY_LWIN;
+					return Keyboard.KEY_LMETA;
 			case KeyEvent.VK_SHIFT:
 				if (position == KeyEvent.KEY_LOCATION_RIGHT)
 					return Keyboard.KEY_RSHIFT;
diff --git a/src/java/org/lwjgl/opengl/WindowsKeycodes.java b/src/java/org/lwjgl/opengl/WindowsKeycodes.java
index d9814d94..b9c60213 100644
--- a/src/java/org/lwjgl/opengl/WindowsKeycodes.java
+++ b/src/java/org/lwjgl/opengl/WindowsKeycodes.java
@@ -562,9 +562,9 @@ final class WindowsKeycodes {
 			case VK_DELETE:
 				return Keyboard.KEY_DELETE;
 			case VK_LWIN:
-				return Keyboard.KEY_LWIN;
+				return Keyboard.KEY_LMETA;
 			case VK_RWIN:
-				return Keyboard.KEY_RWIN;
+				return Keyboard.KEY_RMETA;
 			case VK_APPS:
 				return Keyboard.KEY_APPS;
 /*			case VK_POWER:
diff --git a/src/java/org/lwjgl/util/jinput/KeyMap.java b/src/java/org/lwjgl/util/jinput/KeyMap.java
index 43b18c1d..eec1675f 100644
--- a/src/java/org/lwjgl/util/jinput/KeyMap.java
+++ b/src/java/org/lwjgl/util/jinput/KeyMap.java
@@ -276,9 +276,9 @@ final class KeyMap {
 				return Component.Identifier.Key.INSERT;
 			case Keyboard.KEY_DELETE:
 				return Component.Identifier.Key.DELETE;
-			case Keyboard.KEY_LWIN:
+			case Keyboard.KEY_LMETA:
 				return Component.Identifier.Key.LWIN;
-			case Keyboard.KEY_RWIN:
+			case Keyboard.KEY_RMETA:
 				return Component.Identifier.Key.RWIN;
 			case Keyboard.KEY_APPS:
 				return Component.Identifier.Key.APPS;