diff --git a/_includes/user-menu.html b/_includes/user-menu.html
index f7fe8f91e..e0893f9b3 100644
--- a/_includes/user-menu.html
+++ b/_includes/user-menu.html
@@ -45,11 +45,9 @@
       <li><a href="{{docu}}/configuration/services.html">Services</a></li>
       <hr />
       <li><a href="{{docu}}/configuration/packages.html">Initial Setup Packages</a></li>
-      <li><a href="{{docu}}/configuration/ui-based.html">Paper UI Discovery</a></li>
-      <li><a href="{{docu}}/configuration/ui-based.html">Paper UI Configuration</a></li>
-      <li><a href="{{docu}}/configuration/rules-ng.html">Next-Gen Rules</a></li>
-      <li><a href="{{docu}}/configuration/ui-based.html">HABmin</a></li>
-      <li><a href="{{docu}}/configuration/ui-based.html">HABPanel</a></li>
+      <li><a href="{{docu}}/configuration/paperui.html">Paper UI</a></li>
+      <li><a href="{{docu}}/configuration/habmin.html">HABmin</a></li>
+      <li><a href="{{docu}}/configuration/rules-ng.html">Rules (Experimental)</a></li>
       <hr />
       <li><a href="{{docu}}/configuration/multimedia.html">Audio &amp; Voice</a></li>
     </ul>
@@ -78,6 +76,9 @@
           <li><a href="{{docu}}/addons/uis/habpanel/readme.html">HABPanel</a></li>
           <li><a href="{{docu}}/addons/uis/classic/readme.html">Classic UI</a></li>
           <hr />
+          <li><a href="{{docu}}/addons/uis/apps/android.html">Android openHAB App</a></li>
+          <li><a href="{{docu}}/addons/uis/apps/ios.html">iOS openHAB App</a></li>
+          <hr />
           <li><a href="{{docu}}/addons/iconsets/classic/readme.html">Iconset (classic)</a></li>
         </ul>
       </li>
diff --git a/addons/uis.md b/addons/uis.md
index 9f5007270..a869afe16 100644
--- a/addons/uis.md
+++ b/addons/uis.md
@@ -14,6 +14,12 @@ layout: documentation
 | [HABPanel]({{docu}}/addons/uis/habpanel/readme.html) | HABPanel is a lightweight dashboard interface for openHAB. |
 | [Classic UI]({{docu}}/addons/uis/classic/readme.html) | The Classic UI is the original openHAB 1.x webui, designed for operating openHAB. |
 
+| App | Description          |
+|---------|----------------------|
+| [Android openHAB App]({{docu}}/addons/apps/android.html) | The native Android app to access openHAB on the go. |
+| [iOS openHAB App]({{docu}}/addons/apps/ios.html) | The native iOS app to access openHAB on the go. |
+
+
 | Iconset | Description          |
 |---------|----------------------|
 | [Classic Icons]({{docu}}/addons/iconsets/classic/readme.html) | This is a modernized version of the original icon set of openHAB 1. |
diff --git a/addons/uis/apps/android.md b/addons/uis/apps/android.md
new file mode 100644
index 000000000..46c722996
--- /dev/null
+++ b/addons/uis/apps/android.md
@@ -0,0 +1,25 @@
+---
+layout: documentation
+title: Android openHAB App
+---
+
+{% include base.html %}
+
+# Android openHAB App
+
+We provide a native Android app for openHAB.
+It uses the REST API of openHAB to render sitemaps of your openHAB installation.
+It also supports [my.openhab.org]() including push notifications.
+The latest release version of the app is always available through Google Play.
+
+<!-- Did not work:
+[![Download openHAB app on Google Play](images/google-play-badge.png)](https://play.google.com/store/apps/details?id=org.openhab.habdroid)
+-->
+
+<a href="https://play.google.com/store/apps/details?id=org.openhab.habdroid">
+  <img alt="'Get the openHAB app on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" style="width: 50%; height: 50%"/>
+</a>
+
+Please refer to the [openhab.android project](https://github.com/openhab/openhab.android) on GitHub for more technical details.
+
+{% include contribution-wanted.html %}
diff --git a/addons/uis/apps/images/English_Get_it_Win_10.png b/addons/uis/apps/images/English_Get_it_Win_10.png
new file mode 100644
index 000000000..945f6e772
Binary files /dev/null and b/addons/uis/apps/images/English_Get_it_Win_10.png differ
diff --git a/addons/uis/apps/images/download-on-the-app-store.png b/addons/uis/apps/images/download-on-the-app-store.png
new file mode 100644
index 000000000..24cf61bc4
Binary files /dev/null and b/addons/uis/apps/images/download-on-the-app-store.png differ
diff --git a/addons/uis/apps/images/google-play-badge.png b/addons/uis/apps/images/google-play-badge.png
new file mode 100644
index 000000000..c77b7464b
Binary files /dev/null and b/addons/uis/apps/images/google-play-badge.png differ
diff --git a/addons/uis/apps/ios.md b/addons/uis/apps/ios.md
new file mode 100644
index 000000000..2c5554018
--- /dev/null
+++ b/addons/uis/apps/ios.md
@@ -0,0 +1,21 @@
+---
+layout: documentation
+title: iOS openHAB App
+---
+
+{% include base.html %}
+
+# iOS openHAB App
+
+<!-- https://developer.apple.com/app-store/marketing/guidelines/de/#downloadOnAppstore -->
+
+We provide a native iOS app for openHAB, compatible with iPhone and iPad.
+It uses the REST API of openHAB to render sitemaps of your openHAB installation.
+It also supports [my.openhab.org]() including push notifications.
+The latest release version of the app is always available through the Apple App Store.
+
+[![Download openHAB app on the App Store](images/download-on-the-app-store.png)](https://itunes.apple.com/us/app/openhab/id492054521)
+
+Please refer to the [openhab.ios project](https://github.com/openhab/openhab.ios) on GitHub for more technical details.
+
+{% include contribution-wanted.html %}
diff --git a/configuration/habmin.md b/configuration/habmin.md
new file mode 100644
index 000000000..4c46300f1
--- /dev/null
+++ b/configuration/habmin.md
@@ -0,0 +1,16 @@
+---
+layout: documentation
+title: Configuration though HABmin
+---
+
+{% include base.html %}
+
+# Configuration though HABmin
+
+HABmin is a modern, professional and portable user interface for openHAB,
+providing both user and administrative functions (eg sitemaps for users, and configuration utilities
+to aid setup).
+
+Please refer to the [HABmin Addon documentation]({{docu}}/addons/uis/habmin/readme.html).
+
+{% include contribution-wanted.html %}
diff --git a/configuration/paperui-devices.md b/configuration/paperui-devices.md
deleted file mode 100644
index 227b6f73c..000000000
--- a/configuration/paperui-devices.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: documentation
-title: Paper UI Device Configuration
----
-
-{% include base.html %}
-
-# Paper UI Device Configuration
-
-{% include contribution-wanted.html %}
diff --git a/configuration/ui-based.md b/configuration/paperui.md
similarity index 80%
rename from configuration/ui-based.md
rename to configuration/paperui.md
index 23e7e7e5d..ffa889d22 100644
--- a/configuration/ui-based.md
+++ b/configuration/paperui.md
@@ -1,13 +1,11 @@
 ---
 layout: documentation
-title: User Interfaces for Configuration
+title: Configuration though Paper UI
 ---
 
 {% include base.html %}
 
-# User Interfaces for Configuration
-
-## PaperUI
+# Configuration though Paper UI
 
 Please refer to the [Paper UI Addon documentation]({{docu}}/addons/uis/paper/readme.html).
 
@@ -29,12 +27,4 @@ Here you can find a small screencast about the Paper UI:
 
 [![Paper UI](http://img.youtube.com/vi/MV2a5qwtmRE/0.jpg)](http://www.youtube.com/watch?v=MV2a5qwtmRE)
 
-## HABmin
-
-Please refer to the [HABmin Addon documentation]({{docu}}/addons/uis/habmin/readme.html).
-
-## HabPanel
-
-Please refer to the [HABPanel Addon documentation]({{docu}}/addons/uis/habpanel/readme.html).
-
 {% include contribution-wanted.html %}