diff --git a/Vagrantfile b/Vagrantfile
index 3ebb34fe5..72f7094a7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@
 
 $script = <<SCRIPT
 sudo apt-get update
-sudo apt-get install -y build-essential nodejs python-software-properties zlib1g-dev
+sudo apt-get install -y build-essential nodejs python-software-properties zlib1g-dev dos2unix
 sudo add-apt-repository -y ppa:git-core/ppa
 sudo apt-add-repository -y ppa:brightbox/ruby-ng
 sudo apt-get update
diff --git a/addons/uis/apps/android.md b/addons/uis/apps/android.md
index 5f3c2fbc4..266767185 100644
--- a/addons/uis/apps/android.md
+++ b/addons/uis/apps/android.md
@@ -1,7 +1,7 @@
 ---
 layout: documentation
 title: Android openHAB App
-source: https://github.com/openhab/openhab.android/blob/master/docs/USAGE.md
+source: https://github.com/openhab/openhab-android/blob/master/docs/USAGE.md
 ---
 
 {% include base.html %}
@@ -54,7 +54,7 @@ If you want to use openHAB Android on a wall mounted tablet, go to settings and
 
 ## Help and Technical Details
 
-Please refer to the [openhab.android project on GitHub](https://github.com/openhab/openhab.android) for more details.
+Please refer to the [openhab-android project on GitHub](https://github.com/openhab/openhab-android) for more details.
 
 ## Trademark Disclaimer
 
diff --git a/configuration/multimedia.md b/configuration/multimedia.md
index 94dfc5ec9..3a4c915b8 100644
--- a/configuration/multimedia.md
+++ b/configuration/multimedia.md
@@ -86,7 +86,7 @@ If no voice or no audio sink is provided, the default voice and default audio si
 Although there are already interfaces defined in openHAB for speech-to-text, up to now there is no add-on available for this functionality.
 So the only choice that is available right now is to use the Android voice recognition feature that is built into the openHAB Android app.
 
-The Android app is [not yet adapted to the openHAB 2 voice features](https://github.com/openhab/openhab.android/issues/242).
+The Android app is [not yet adapted to the openHAB 2 voice features](https://github.com/openhab/openhab-android/issues/242).
 To still use the voice feature you will need to have a String item with the name "VoiceCommand" defined, to which the app sends any recognized text as a string command.
 
 ### Human Language Interpreter
diff --git a/invalidlinks.html b/invalidlinks.html
index e1beedebb..8c24a3c0f 100644
--- a/invalidlinks.html
+++ b/invalidlinks.html
@@ -767,10 +767,10 @@ HTTP 301 (moved permanent) encountered: you should update this link.</td></tr>
  summary="checked link" bgcolor="#fff7e5">
 <tr>
 <td bgcolor="#dcd5cf">URL</td>
-<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab.android/issues/242'</td></tr>
+<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab-android/issues/242'</td></tr>
 <tr><td>Name</td><td>`not yet adapted to the openHAB 2 voice features'</td></tr>
 <tr><td>Parent&nbsp;URL</td><td><a target="top" href="http://docs.openhab.org/configuration/multimedia.html">http://docs.openhab.org/configuration/multimedia.html</a>, line 1292, col 23</td></tr>
-<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab.android/issues/242">https://github.com/openhab/openhab.android/issues/242</a></td></tr>
+<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab-android/issues/242">https://github.com/openhab/openhab-android/issues/242</a></td></tr>
 <tr><td>Check&nbsp;time</td><td>1.213 seconds</td></tr>
 <tr><td bgcolor="#e0954e" valign="top">Warning</td><td bgcolor="#e0954e">Access denied by robots.txt, skipping content checks.</td></tr>
 <tr><td bgcolor="#3ba557">Result</td><td bgcolor="#3ba557">Valid: 200 OK</td></tr>
@@ -4155,10 +4155,10 @@ Access to redirected URL denied by robots.txt, checked only syntax.</td></tr>
  summary="checked link" bgcolor="#fff7e5">
 <tr>
 <td bgcolor="#dcd5cf">URL</td>
-<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab.android'</td></tr>
+<td bgcolor="#dcd5cf">`https://github.com/openhab/openhab-android'</td></tr>
 <tr><td>Name</td><td>`openhab/android project on GitHub'</td></tr>
 <tr><td>Parent&nbsp;URL</td><td><a target="top" href="http://docs.openhab.org/addons/uis/apps/android.html">http://docs.openhab.org/addons/uis/apps/android.html</a>, line 1247, col 24</td></tr>
-<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab.android">https://github.com/openhab/openhab.android</a></td></tr>
+<tr><td>Real&nbsp;URL</td><td><a target="top" href="https://github.com/openhab/openhab-android">https://github.com/openhab/openhab-android</a></td></tr>
 <tr><td>Check&nbsp;time</td><td>0.715 seconds</td></tr>
 <tr><td bgcolor="#e0954e" valign="top">Warning</td><td bgcolor="#e0954e">Access denied by robots.txt, skipping content checks.</td></tr>
 <tr><td bgcolor="#3ba557">Result</td><td bgcolor="#3ba557">Valid: 200 OK</td></tr>
diff --git a/pom.xml b/pom.xml
index 63e358611..9e398c9ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,7 @@
               <outputDirectory>${basedir}/addons/uis/apps</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${basedir}/${basedir}/.external-resources/openhab.android/docs</directory>
+                  <directory>${basedir}/${basedir}/.external-resources/openhab-android/docs</directory>
                   <includes>
                     <include>images/*.png</include>
                   </includes>
@@ -445,7 +445,7 @@
               <goal>copy</goal>
             </goals>
             <configuration>
-              <sourceFile>${basedir}/.external-resources/openhab.android/docs/USAGE.md</sourceFile>
+              <sourceFile>${basedir}/.external-resources/openhab-android/docs/USAGE.md</sourceFile>
               <destinationFile>${basedir}/addons/uis/apps/android.md</destinationFile>
             </configuration>
           </execution>
diff --git a/update-external-resources.sh b/update-external-resources.sh
index a144e1d6e..5ebb01954 100755
--- a/update-external-resources.sh
+++ b/update-external-resources.sh
@@ -52,7 +52,7 @@ pull_or_clone_repo "openhab-bundles" "openhab/openhab-bundles.git"
 pull_or_clone_repo "openhabian" "openhab/openhabian.git"
 pull_or_clone_repo "openhab-alexa" "openhab/openhab-alexa.git"
 pull_or_clone_repo "openhab-mycroft" "openhab/openhab-mycroft.git"
-pull_or_clone_repo "openhab.android" "openhab/openhab.android.git"
+pull_or_clone_repo "openhab-android" "openhab/openhab-android.git"
 
 echo_process "Updating submodules of the 'openhab-bundles' repo... "
 git -C "$resourcefolder/openhab-bundles" submodule update --recursive --remote --init
diff --git a/v2.1.0/addons/uis/apps/android.html b/v2.1.0/addons/uis/apps/android.html
index 830d8f1a3..8b7c3d41c 100644
--- a/v2.1.0/addons/uis/apps/android.html
+++ b/v2.1.0/addons/uis/apps/android.html
@@ -874,7 +874,7 @@ There are a number of strategies available to provide <a href="/v2.1.0/installat
 
 <p><strong>Help and technical details:</strong></p>
 
-<p>Please refer to the <a href="https://github.com/openhab/openhab.android">openhab/android project on GitHub</a> for more details.</p>
+<p>Please refer to the <a href="https://github.com/openhab/openhab-android">openhab/android project on GitHub</a> for more details.</p>
 
     </div>
   </div>
diff --git a/v2.1.0/configuration/multimedia.html b/v2.1.0/configuration/multimedia.html
index 6268e1543..249f3e4ff 100644
--- a/v2.1.0/configuration/multimedia.html
+++ b/v2.1.0/configuration/multimedia.html
@@ -911,7 +911,7 @@ If no voice or no audio sink is provided, the default voice and default audio si
 
 <p>Although there are already interfaces defined in openHAB for speech-to-text, up to now there is no add-on available for this functionality.
 So the only choice that is available right now is to use the Android voice recognition feature that is built into the openHAB Android app.
-Currently, the Android app is <a href="https://github.com/openhab/openhab.android/issues/242">not yet adapted to the openHAB 2 voice features</a>, though - to use it, you will need to have a String item with the name “VoiceCommand” defined, to which the app sends any recognized text as a string command.</p>
+Currently, the Android app is <a href="https://github.com/openhab/openhab-android/issues/242">not yet adapted to the openHAB 2 voice features</a>, though - to use it, you will need to have a String item with the name “VoiceCommand” defined, to which the app sends any recognized text as a string command.</p>
 
 <h3 id="human-language-interpreter">Human Language Interpreter</h3>