diff --git a/Release-Notes/MaxScale-0.5-Release-Notes.md b/Release-Notes/MaxScale-0.5-Release-Notes.md
index 403bf1d92..3ae56ce9e 100644
--- a/Release-Notes/MaxScale-0.5-Release-Notes.md
+++ b/Release-Notes/MaxScale-0.5-Release-Notes.md
@@ -48,7 +48,7 @@ MaxScale has added the ability to bind a listener for a service to a network add
 
 The server version reported when connected to a database via MaxScale has now been altered. This now shows the MaxScale name and version together with the backend server name. An example of this can be seen below for the 0.5 release.
 
--bash-4.1$ mysql -h 127.0.0.1 -P 4006 -uxxxx -pxxxx
Welcome to the MariaDB monitor.  Commands end with ; or \g.
Your MySQL connection id is 22320
Server version: MaxScale 0.5.0 MariaDB Server

Copyright (c) 2000, 2012, Oracle, Monty Program Ab and others.

Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.

MySQL [(none)]> \s
--------------
mysql  Ver 15.1 Distrib 5.5.28a-MariaDB, for Linux (i686) using readline 5.1

...
Server:			MySQL
Server version:		MaxScale 0.5.0 MariaDB Server
...
--------------

MySQL [(none)]>
+-bash-4.1$ mysql -h 127.0.0.1 -P 4006 -uxxxx -pxxxx
Welcome to the MariaDB monitor.  Commands end with ; or \\g.
Your MySQL connection id is 22320
Server version: MaxScale 0.5.0 MariaDB Server

Copyright (c) 2000, 2012, Oracle, Monty Program Ab and others.

Type 'help;' or '\\h' for help. Type '\\c' to clear the current input statement.

MySQL [(none)]> \\ys
--------------
mysql  Ver 15.1 Distrib 5.5.28a-MariaDB, for Linux (i686) using readline 5.1

...
Server:			MySQL
Server version:		MaxScale 0.5.0 MariaDB Server
...
--------------

MySQL [(none)]>
 
 # Bug Fixes
 
diff --git a/generate-html.cmake b/generate-html.cmake
new file mode 100644
index 000000000..1e8b59ea1
--- /dev/null
+++ b/generate-html.cmake
@@ -0,0 +1,18 @@
+# The BUILD_DIR variable is set at runtime
+
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
+find_package(Pandoc)
+
+if(PANDOC_FOUND AND BUILD_DIR)
+  file(MAKE_DIRECTORY ${BUILD_DIR}/html)
+  file(GLOB_RECURSE MARKDOWN *.md)
+  foreach(VAR ${MARKDOWN})
+    string(REPLACE ".md" ".html" OUTPUT ${VAR})
+    get_filename_component(DIR ${VAR} DIRECTORY)
+    string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}" "${BUILD_DIR}/html" FILE ${OUTPUT})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${DIR} ${PANDOC_EXECUTABLE} ${VAR} -o ${OUTPUT})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OUTPUT} ${FILE})
+  endforeach()
+endif()
diff --git a/generate-pdf.cmake b/generate-pdf.cmake
new file mode 100644
index 000000000..982332e45
--- /dev/null
+++ b/generate-pdf.cmake
@@ -0,0 +1,18 @@
+# The BUILD_DIR variable is set at runtime
+
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
+find_package(Pandoc)
+
+if(PANDOC_FOUND AND BUILD_DIR)
+  file(MAKE_DIRECTORY ${BUILD_DIR}/pdf)
+  file(GLOB_RECURSE MARKDOWN *.md)
+  foreach(VAR ${MARKDOWN})
+    string(REPLACE ".md" ".pdf" OUTPUT ${VAR})
+    get_filename_component(DIR ${VAR} DIRECTORY)
+    string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}" "${BUILD_DIR}/pdf" FILE ${OUTPUT})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${DIR} ${PANDOC_EXECUTABLE} ${VAR} -o ${OUTPUT})
+    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OUTPUT} ${FILE})
+  endforeach()
+endif()