diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
new file mode 100644
index 0000000..9ef14b6
--- /dev/null
+++ b/MIT-LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Thomas-Antoine O'Neill aka tommytony, http://war.tommytony.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8a96c78
--- /dev/null
+++ b/README.md
@@ -0,0 +1,37 @@
+![War logo](http://i.imgur.com/LFdiF.png "War - Minecraft PVP Arenas - TDM, CTF and more!")
+
+War - Minecraft PVP Arenas (TDM, CTF and more!)
+===============================================
+
+War is a plugin for Bukkit that adds PVP arenas and team deathmatch gamemodes to Minecraft servers.
+
+Official website
+----------------
+Visit http://war.tommytony.com for more info, videos and links.
+
+Features
+--------
+- Built on the popular Bukkit mod API (http://bukkit.org)
+- Capture-the-flag and team deathmatch arenas, called warzones
+- Warzone blocks are saved and reset at the end of every game, for safely destructible maps
+- Other game types: capture points and explosive-based objectives
+- Up to 16 teams!
+- Tons of customizable game rules, item loadouts and options (see [Instructions](http://war.tommytony.com/instructions))
+- SpoutPlugin integration for an enriched UI experience during combat for Spoutcraft users (http://spout.org)
+
+Downloads
+---------
+All official releases are at https://github.com/taoneill/war/downloads.
+
+Dev Builds
+----------
+Continuous integration builds are available at http://ci.tommytony.com/jobs/War.
+
+Author
+------
+tommytony started the plugin in December 2010 on hMod and has been maintaining it since with the help of contributors.
+Reach him at taoneill@tommytony.com.
+
+License
+-------
+War is licensed loosely under the MIT License (but still comes with the weird baggage of Bukkit licensing)
\ No newline at end of file
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 9fe31dc..0000000
--- a/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-War adds team deathmatch and capture-the-flag to Minecraft SMP.
-
-The plugin started on hMod but was ported to Bukkit from v0.3 on.
-
-Grab your copy in the Downloads section.
-
-Go to http://war.tommytony.com for more.
-
-All credit goes to Mojang, hey0 and the Bukkit team for being so awesome.
\ No newline at end of file