diff --git a/X11rdp-o-matic.sh b/X11rdp-o-matic.sh
index 830d67f..2be0101 100755
--- a/X11rdp-o-matic.sh
+++ b/X11rdp-o-matic.sh
@@ -489,7 +489,7 @@ compile_xrdp_interactive()
   rm README.Debian
   rm README.source
   cp ../COPYING copyright # use the xrdp copyright file
-  cp ../readme.txt README # use the xrdp readme.txt as the README file
+  cp ../README.md README # use the xrdp readme.txt as the README file
   cp "$BASEDIR/debian/postinst" postinst # postinst to create xrdp init.d defaults
   cp "$BASEDIR/debian/control" control # use a generic control file
   cp "$BASEDIR/debian/prerm" prerm # pre-removal script
@@ -531,7 +531,7 @@ compile_xrdp_noninteractive()
   rm README.Debian
   rm README.source
   cp ../COPYING copyright # use the xrdp copyright file
-  cp ../readme.txt README # use the xrdp readme.txt as the README file
+  cp ../README.md README # use the xrdp readme.txt as the README file
   cp "$BASEDIR/debian/postinst" postinst # postinst to create xrdp init.d defaults
   cp "$BASEDIR/debian/control" control # use a generic control file
   cp "$BASEDIR/debian/prerm" prerm # pre-removal script
@@ -676,9 +676,9 @@ welcome_message()
 # Worked out from the chosen branch.
 calculate_version_num()
 {
-  README="https://raw.github.com/neutrinolabs/xrdp/$XRDPBRANCH/readme.txt"
+  README="https://raw.github.com/neutrinolabs/xrdp/$XRDPBRANCH/README.md"
   wget --no-check-certificate -O "$TMPFILE" "$README" >& /dev/null
-  VERSION=$(grep xrdp "$TMPFILE" | head -1 | cut -d " " -f2)
+  VERSION=$(grep -i version "$TMPFILE" | head -1 | cut -d " " -f3)
   rm -f "$TMPFILE"
   if [ "${XRDPBRANCH#v}" = "$XRDPBRANCH" ]
   then