diff --git a/WhatsNew b/WhatsNew
index 929318071..537f9e780 100644
--- a/WhatsNew
+++ b/WhatsNew
@@ -8,7 +8,7 @@ Version 1.0:
 		SDL_reinterpret_cast(type, expression)
 		SDL_static_cast(type, expression)
 
-	Added SDL_NO_LOCK_KEYS environment variable to enable normal
+	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal
 	up/down events for Caps-Lock and Num-Lock keys.
 
 1.2.13:
diff --git a/docs.html b/docs.html
index 0815a5747..7bca563e6 100644
--- a/docs.html
+++ b/docs.html
@@ -34,7 +34,7 @@ SDL 1.2.14 is a significant bug fix release and a recommended update.
 	Fixed freeze in SDL_memset() with 0 length when assembly code is disabled.
 </P>
 <P>
-	Added SDL_NO_LOCK_KEYS environment variable to enable normal up/down events for Caps-Lock and Num-Lock keys.
+	Added SDL_DISABLE_LOCK_KEYS environment variable to enable normal up/down events for Caps-Lock and Num-Lock keys.
 </P>
 <P>
 	Fixed audio quality problem when converting between 22050 Hz and 44100 Hz.
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index 60e7a66fc..4767f2e15 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -73,8 +73,8 @@ int SDL_KeyboardInit(void)
 	SDL_EnableKeyRepeat(0, 0);
 
 	/* Allow environment override to disable special lock-key behavior */
-	env = SDL_getenv("SDL_NO_LOCK_KEYS");
 	SDL_NoLockKeys = 0;
+	env = SDL_getenv("SDL_DISABLE_LOCK_KEYS");
 	if (env) {
 		switch (SDL_atoi(env)) {
 			case 1: