diff --git a/src/lib/marble/MarbleWidgetPopupMenu.cpp b/src/lib/marble/MarbleWidgetPopupMenu.cpp
--- a/src/lib/marble/MarbleWidgetPopupMenu.cpp
+++ b/src/lib/marble/MarbleWidgetPopupMenu.cpp
@@ -26,6 +26,7 @@
 #include "GeoDataPlacemark.h"
 #include "GeoDataSnippet.h"
 #include "GeoDataStyle.h"
+#include "GeoDataIconStyle.h"
 #include "GeoDataTypes.h"
 #include "GeoDataPhotoOverlay.h"
 #include "GeoSceneDocument.h"
@@ -41,6 +42,7 @@
 #include "BookmarkManager.h"
 #include "ReverseGeocodingRunnerManager.h"
 #include "TemplateDocument.h"
+#include "OsmPlacemarkData.h"
 
 // Qt
 #include <QApplication>
@@ -96,6 +98,7 @@
     static void setupDialogGeoPlaces( PopupLayer *popup, const GeoDataPlacemark *placemark );
     static void setupDialogSkyPlaces( PopupLayer *popup, const GeoDataPlacemark *placemark );
     static void setupDialogPhotoOverlay( PopupLayer *popup, const GeoDataPhotoOverlay *overlay);
+    static void setupDialogOsm( PopupLayer *popup, const GeoDataPlacemark* placemark );
 };
 
 MarbleWidgetPopupMenu::Private::Private( MarbleWidget *widget, const MarbleModel *model, MarbleWidgetPopupMenu* parent ) :
@@ -345,6 +348,130 @@
     popup->setContent(doc.finalText(), baseUrl );
 }
 
+void MarbleWidgetPopupMenu::Private::setupDialogOsm( PopupLayer *popup, const GeoDataPlacemark *placemark )
+{
+    const GeoDataCoordinates location = placemark->coordinate();
+    popup->setCoordinates(location, Qt::AlignRight | Qt::AlignVCenter);
+
+    QFile descriptionFile(":/marble/webpopup/osm.html");
+    if (!descriptionFile.open(QIODevice::ReadOnly)) {
+        return;
+    }
+
+    QString description = descriptionFile.readAll();
+
+    OsmPlacemarkData data = placemark->osmData();
+
+    if (data.containsTagKey("name")){
+        description = description.replace("%name%", data.tagValue("name"));
+    } else {
+        description = description.replace("<div class=\"osmname\"><h1>%name%</h1></div>", "");
+    }
+    if (data.containsTagKey("amenity")){
+        description = description.replace("%amenity%", data.tagValue("amenity"));
+    } else {
+        description = description.replace("<h2 class=\"osmamenity\">%amenity%</h2>", "");
+    }
+
+    if (data.containsTagKey("cuisine")){
+        description = description.replace("%cuisine%", data.tagValue("cuisine"));
+    } else {
+        description = description.replace("<h3 class=\"osmcuisine\">%cuisine%</h3>", "");
+    }
+
+    if (data.containsTagKey("opening_hours")){
+        description = description.replace("%openinghours%", data.tagValue("opening_hours"));
+    } else {
+        description = description.replace("<p class=\"openinghours\">Opening Hours: %openinghours%</p>", "");
+    }
+
+    bool hasAddressData = false;
+    foreach(const QString &tag, QStringList() << "addr:street" << "addr:housenumber" << "addr:postcode" << "addr:city") {
+        if (data.containsTagKey(tag)){
+            hasAddressData = true;
+            break;
+        }
+    }
+
+    bool hasWebsiteData = false;
+    foreach(const QString &tag, QStringList() << "website" << "contact:website" << "facebook" << "contact:facebook" << "url") {
+        if (data.containsTagKey(tag)){
+            hasWebsiteData = true;
+            break;
+        }
+    }
+
+    bool hasPhoneData = data.containsTagKey("phone");
+
+    bool hasContactsData = hasAddressData || hasPhoneData || hasWebsiteData;
+
+    if (hasContactsData){
+        if (hasAddressData){
+            if (!data.containsTagKey("addr:street") && !data.containsTagKey("addr:housenumber")){
+                description = description.replace("<br> %postcode%", "%postcode%");
+            }
+            foreach (const QString tag, QStringList() << "addr:street" << "addr:housenumber" << "addr:postcode" << "addr:city") {
+                if (data.containsTagKey(tag)){
+                    description = description.replace("%"+tag.split("addr:")[1]+"%", data.tagValue(tag));
+                } else {
+                    description = description.replace("%"+tag.split("addr:")[1]+"%", "");
+                }
+            }
+        } else {
+            description = description.replace("<tr>\n  <td>Address:</td><td>%street% %housenumber% <br> %postcode% %city%</td>\n</tr>", "");
+        }
+
+        if (hasPhoneData){
+            description = description.replace("%phone%", data.tagValue("phone"));
+        } else {
+            description = description.replace("<tr>\n  <td>Phone:</td><td>%phone%</td>\n</tr>", "");
+        }
+
+        if (hasWebsiteData){
+            foreach(const QString tag, QStringList() << "website" << "contact:website" << "facebook" << "contact:facebook" << "url") {
+                if (data.containsTagKey(tag)){
+                    description = description.replace("%website%", data.tagValue(tag));
+                    break;
+                }
+            }
+        } else {
+            description = description.replace("<tr>\n  <td>Website:</td><td>%website%</td>\n</tr>", "");
+        }
+    } else {
+        QString s1 = description.split("<table>\n<tr class=\"blue\">\n  <td colspan=\"2\">Contact</td>\n</tr>")[0];
+        QString s2 = description.split("<tr>\n  <td>Website:</td><td>%website%</td>\n</tr>\n</table>")[1];
+        description = s1 + s2;
+    }
+
+    if (data.containsTagKey("wheelchair") || data.containsTagKey("internet_access") || data.containsTagKey("smoking")){
+        if (data.containsTagKey("wheelchair")){
+            description = description.replace("%wheelchair%", data.tagValue("wheelchair"));
+        } else {
+            description = description.replace("<tr>\n  <td>Wheelchair access</td><td>%wheelchair%</td>\n</tr>", "");
+        }
+
+        if (data.containsTagKey("internet_access")){
+            description = description.replace("%internetaccess%", data.tagValue("internet_access"));
+        } else {
+            description = description.replace("<tr>\n  <td>Internet</td><td>%internetaccess%</td>\n</tr>", "");
+        }
+
+        if (data.containsTagKey("smoking")){
+            description = description.replace("%smoking%", data.tagValue("smoking"));
+        } else {
+            description = description.replace("<tr>\n  <td>Smoking</td><td>%smoking%</td>\n</tr>", "");
+        }
+    } else {
+        QString s1 = description.split("<table>\n<tr class=\"blue\">\n  <td colspan=\"2\">Popular Facilities</td>\n</tr>")[0];
+        QString s2 = description.split("<tr>\n  <td>Smoking</td><td>%smoking%</td>\n</tr>\n</table>")[1];
+        description = s1 + s2;
+    }
+
+    TemplateDocument doc(description);
+
+    popup->setContent(doc.finalText());
+}
+
 MarbleWidgetPopupMenu::MarbleWidgetPopupMenu(MarbleWidget *widget,
                                          const MarbleModel *model)
     : QObject(widget),
@@ -479,6 +606,13 @@
         bool isCity = false;
         bool isNation = false;
 
+        OsmPlacemarkData data = placemark->osmData();
+        bool hasOsmData = data.containsTagKey("name") || data.containsTagKey("amenity") || data.containsTagKey("cuisine") || data.containsTagKey("opening_hours")
+                || data.containsTagKey("addr:street") || data.containsTagKey("addr:housenumber") || data.containsTagKey("addr:postcode") || data.containsTagKey("addr:city")
+                || data.containsTagKey("phone") || data.containsTagKey("wheelchair") || data.containsTagKey("internet_access") || data.containsTagKey("smoking")
+                || data.containsTagKey("website") || data.containsTagKey("contact:website") || data.containsTagKey("facebook") || data.containsTagKey("contact:facebook")
+                || data.containsTagKey("url");
+
         if ( placemark ) {
             isSatellite = (placemark->visualCategory() == GeoDataFeature::Satellite);
             isCity = (placemark->visualCategory() >= GeoDataFeature::SmallCity &&
@@ -494,7 +628,9 @@
 
         popup->setSize(QSizeF(400, 400));
 
-        if (isSatellite) {
+        if (hasOsmData){
+            Private::setupDialogOsm( popup, placemark );
+        } else if (isSatellite) {
             d->setupDialogSatellite( placemark );
         } else if (isCity) {
             Private::setupDialogCity( popup, placemark );
diff --git a/src/lib/marble/libmarble.qrc b/src/lib/marble/libmarble.qrc
--- a/src/lib/marble/libmarble.qrc
+++ b/src/lib/marble/libmarble.qrc
@@ -98,6 +98,7 @@
         <file alias="nation.html">webpopup/nation.html</file>
         <file alias="skyplace.html">webpopup/skyplace.html</file>
         <file alias="photooverlay.html">webpopup/photooverlay.html</file>
+        <file alias="osm.html">webpopup/osm.html</file>
     </qresource>
     <qresource prefix="/htmlfeatures">
         <file alias="files/bootstrap.min.css">htmlfeatures/bootstrap.min.css</file>
diff --git a/src/lib/marble/webpopup/osm.html b/src/lib/marble/webpopup/osm.html
--- a/src/lib/marble/webpopup/osm.html
+++ b/src/lib/marble/webpopup/osm.html
@@ -29,7 +29,7 @@
   <td>Phone:</td><td>%phone%</td>
 </tr>
 <tr>
-  <td>Website:</td><td>%website% m</td>
+  <td>Website:</td><td>%website%</td>
 </tr>
 </table>