diff --git a/Makefile b/Makefile
index 1dcbc676..967ba266 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ dist : reallyclean
 	set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
 	
 	mkdir -p dist/mosquitto-${VERSION}
-	cp -r client examples installer lib logo man misc security service src test about.html aclfile.example ChangeLog.txt CMakeLists.txt compiling.txt config.h config.mk CONTRIBUTING.md edl-v10 epl-v10 LICENSE.txt Makefile mosquitto.conf notice.html pskfile.example pwfile.example readme.txt readme-windows.txt dist/mosquitto-${VERSION}/
+	cp -r client examples installer lib logo man misc security service src test about.html aclfile.example ChangeLog.txt CMakeLists.txt compiling.txt config.h config.mk CONTRIBUTING.md edl-v10 epl-v10 LICENSE.txt Makefile mosquitto.conf notice.html pskfile.example pwfile.example readme.md readme-windows.txt dist/mosquitto-${VERSION}/
 	cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
 	set -e; for m in man/*.xml; \
 		do \
diff --git a/installer/mosquitto-cygwin.nsi b/installer/mosquitto-cygwin.nsi
index d20c57e8..a3283ddf 100644
--- a/installer/mosquitto-cygwin.nsi
+++ b/installer/mosquitto-cygwin.nsi
@@ -57,7 +57,7 @@ Section "Files" SecInstall
 	File "..\ChangeLog.txt"
 	File "..\mosquitto.conf"
 	File "..\pwfile.example"
-	File "..\readme.txt"
+	File "..\readme.md"
 	File "..\readme-windows.txt"
 	;File "C:\pthreads\Pre-built.2\dll\x86\pthreadVC2.dll"
 	;File "C:\OpenSSL-Win32\libeay32.dll"
diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
index 1f7c21ff..d54cb5db 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -52,7 +52,7 @@ Section "Files" SecInstall
 	File "..\ChangeLog.txt"
 	File "..\mosquitto.conf"
 	File "..\pwfile.example"
-	File "..\readme.txt"
+	File "..\readme.md"
 	File "..\readme-windows.txt"
 	;File "C:\pthreads\Pre-built.2\dll\x86\pthreadVC2.dll"
 	;File "C:\OpenSSL-Win32\libeay32.dll"
diff --git a/readme.md b/readme.md
new file mode 100644
index 00000000..20e20d0d
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,21 @@
+Mosquitto
+=========
+
+Mosquitto is an open source implementation of a server for version 3.1 and
+3.1.1 of the MQTT protocol.
+
+See the following links for more information on MQTT:
+
+- Community page: <http://mqtt.org/>
+- MQTT v3.1.1 standard: <http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/mqtt-v3.1.1.html>
+
+Mosquitto project information is available at the following locations:
+
+- Main homepage: <http://mosquitto.org/>
+- Find existing bugs: <https://bugs.eclipse.org/bugs/buglist.cgi?product=Mosquitto>
+- Submit a bug: <https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mosquitto>
+- Source code repository: <http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git/>
+
+There is also a public test server available at <http://test.mosquitto.org/>
+
+Mosquitto was written by Roger Light <roger@atchoo.org>
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index 143ddecc..00000000
--- a/readme.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Mosquitto
-=========
-
-Mosquitto is an open source implementation of a server for version 3.1 and
-3.1.1 of the MQTT protocol.
-
-See the following links for more information on MQTT:
-
-http://mqtt.org/
-http://www.ibm.com/developerworks/webservices/library/ws-mqtt/index.html
-
-Mosquitto project information is available at the following locations:
-
-http://mosquitto.org/ (main homepage)
-https://bugs.eclipse.org/bugs/buglist.cgi?product=Mosquitto (Find bugs)
-https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mosquitto (Submit bugs)
-http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git/ (source code repository, web interface
-
-There is also a public test server available at http://test.mosquitto.org/
-
-Mosquitto was written by Roger Light <roger@atchoo.org>