diff --git a/README b/README
index e288bdfb..e8756a0b 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
 Project Homepage: http://luajit.org/
 
 LuaJIT is Copyright (C) 2005-2011 Mike Pall.
-LuaJIT is free software, released under the MIT/X license.
+LuaJIT is free software, released under the MIT license.
 See full Copyright Notice in the COPYRIGHT file or in luajit.h.
 
 Documentation for LuaJIT is available in HTML format.
diff --git a/doc/luajit.html b/doc/luajit.html
index 28ebff61..1d5a0b64 100644
--- a/doc/luajit.html
+++ b/doc/luajit.html
@@ -62,7 +62,7 @@ programming language.
 <p>
 LuaJIT is Copyright &copy; 2005-2011 Mike Pall.
 LuaJIT is open source software, released under the
-<a href="http://www.opensource.org/licenses/mit-license.php"><span class="ext">&raquo;</span>&nbsp;MIT/X license</a>.
+<a href="http://www.opensource.org/licenses/mit-license.php"><span class="ext">&raquo;</span>&nbsp;MIT license</a>.
 </p>
 <p class="indent" style="color: #606060;">
 * Lua is a powerful, dynamic and light-weight programming language
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h
index 87db7f00..43d29633 100644
--- a/dynasm/dasm_arm.h
+++ b/dynasm/dasm_arm.h
@@ -1,7 +1,7 @@
 /*
 ** DynASM ARM encoding engine.
 ** Copyright (C) 2005-2011 Mike Pall. All rights reserved.
-** Released under the MIT/X license. See dynasm.lua for full copyright notice.
+** Released under the MIT license. See dynasm.lua for full copyright notice.
 */
 
 #include <stddef.h>
diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h
index 1c8580fb..4b4ffe8a 100644
--- a/dynasm/dasm_ppc.h
+++ b/dynasm/dasm_ppc.h
@@ -1,7 +1,7 @@
 /*
 ** DynASM PPC encoding engine.
 ** Copyright (C) 2005-2011 Mike Pall. All rights reserved.
-** Released under the MIT/X license. See dynasm.lua for full copyright notice.
+** Released under the MIT license. See dynasm.lua for full copyright notice.
 */
 
 #include <stddef.h>
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h
index dc9ed510..3cc3af24 100644
--- a/dynasm/dasm_proto.h
+++ b/dynasm/dasm_proto.h
@@ -1,7 +1,7 @@
 /*
 ** DynASM encoding engine prototypes.
 ** Copyright (C) 2005-2011 Mike Pall. All rights reserved.
-** Released under the MIT/X license. See dynasm.lua for full copyright notice.
+** Released under the MIT license. See dynasm.lua for full copyright notice.
 */
 
 #ifndef _DASM_PROTO_H
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h
index 23e213cb..8f2dd1ca 100644
--- a/dynasm/dasm_x86.h
+++ b/dynasm/dasm_x86.h
@@ -1,7 +1,7 @@
 /*
 ** DynASM x86 encoding engine.
 ** Copyright (C) 2005-2011 Mike Pall. All rights reserved.
-** Released under the MIT/X license. See dynasm.lua for full copyright notice.
+** Released under the MIT license. See dynasm.lua for full copyright notice.
 */
 
 #include <stddef.h>
diff --git a/etc/luajit.1 b/etc/luajit.1
index b8713d4e..57080bce 100644
--- a/etc/luajit.1
+++ b/etc/luajit.1
@@ -73,7 +73,7 @@ Runs some nested loops and shows the resulting traces.
 .PP
 \fBLuaJIT\fR is Copyright \(co 2005-2011 Mike Pall.
 .br
-\fBLuaJIT\fR is open source software, released under the MIT/X license.
+\fBLuaJIT\fR is open source software, released under the MIT license.
 .SH SEE ALSO
 .PP
 More details in the provided HTML docs or at:
diff --git a/lib/bc.lua b/lib/bc.lua
index f4ee8e8a..c2c9502e 100644
--- a/lib/bc.lua
+++ b/lib/bc.lua
@@ -2,7 +2,7 @@
 -- LuaJIT bytecode listing module.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
 -- This module lists the bytecode of a Lua function. If it's loaded by -jbc
diff --git a/lib/bcsave.lua b/lib/bcsave.lua
index c34bec89..6c6d9f0a 100644
--- a/lib/bcsave.lua
+++ b/lib/bcsave.lua
@@ -2,7 +2,7 @@
 -- LuaJIT module to save/list bytecode.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
 -- This module saves or lists the bytecode for an input file.
diff --git a/lib/dis_arm.lua b/lib/dis_arm.lua
index e4e98afc..c2d1408f 100644
--- a/lib/dis_arm.lua
+++ b/lib/dis_arm.lua
@@ -2,7 +2,7 @@
 -- LuaJIT ARM disassembler module.
 --
 -- Copyright (C) 2005-2010 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This is a helper module used by the LuaJIT machine code dumper module.
 --
diff --git a/lib/dis_x64.lua b/lib/dis_x64.lua
index 6ba49143..8c9cb4fa 100644
--- a/lib/dis_x64.lua
+++ b/lib/dis_x64.lua
@@ -2,7 +2,7 @@
 -- LuaJIT x64 disassembler wrapper module.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This module just exports the 64 bit functions from the combined
 -- x86/x64 disassembler module. All the interesting stuff is there.
diff --git a/lib/dis_x86.lua b/lib/dis_x86.lua
index f489a861..d9a1f321 100644
--- a/lib/dis_x86.lua
+++ b/lib/dis_x86.lua
@@ -2,7 +2,7 @@
 -- LuaJIT x86/x64 disassembler module.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 -- This is a helper module used by the LuaJIT machine code dumper module.
 --
diff --git a/lib/dump.lua b/lib/dump.lua
index 6ada21bc..7ddc9c07 100644
--- a/lib/dump.lua
+++ b/lib/dump.lua
@@ -2,7 +2,7 @@
 -- LuaJIT compiler dump module.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
 -- This module can be used to debug the JIT compiler itself. It dumps the
diff --git a/lib/v.lua b/lib/v.lua
index d2a0c235..ca9b4ac8 100644
--- a/lib/v.lua
+++ b/lib/v.lua
@@ -2,7 +2,7 @@
 -- Verbose mode of the LuaJIT compiler.
 --
 -- Copyright (C) 2005-2011 Mike Pall. All rights reserved.
--- Released under the MIT/X license. See Copyright Notice in luajit.h
+-- Released under the MIT license. See Copyright Notice in luajit.h
 ----------------------------------------------------------------------------
 --
 -- This module shows verbose information about the progress of the