diff --git a/docs/commandref.html b/docs/commandref.html
index ab174b754..31ec6bd5b 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -7285,7 +7285,7 @@ AB600, Duewi, DomiaLite, COCO) and others. <br>
   <a name="weblinkdefine"></a>
   <b>Define</b>
   <ul>
-    <code>define &lt;name&gt; weblink [link|fileplot|image|iframe]
+    <code>define &lt;name&gt; weblink [link|fileplot|image|iframe|htmlCode]
                 &lt;argument&gt;</code>
     <br><br>
     This is a placeholder used with webpgm2 to be able to integrate links
@@ -7297,6 +7297,8 @@ AB600, Duewi, DomiaLite, COCO) and others. <br>
       <code>define homepage weblink link http://www.fhem.de</code><br>
       <code>define webcam_picture weblink image http://w.x.y.z/current.jpg</code><br>
       <code>define interactive_webcam weblink iframe http://w.x.y.z/webcam.cgi</code><br>
+      <code>define define hr weblink htmlCode <hr><code><br>
+      <code>define define w_Frlink weblink htmlCode { WeatherAsHtml("w_Frankfurt") }</code><br>
       <code>define MyPlot weblink fileplot &lt;logdevice&gt;:&lt;gnuplot-file&gt;:&lt;logfile&gt;</code><br>
     </ul>
     <br>
diff --git a/webfrontend/pgm2/01_FHEMWEB.pm b/webfrontend/pgm2/01_FHEMWEB.pm
index 0220bf0ea..480c990f3 100755
--- a/webfrontend/pgm2/01_FHEMWEB.pm
+++ b/webfrontend/pgm2/01_FHEMWEB.pm
@@ -2003,4 +2003,34 @@ FW_devState($$)
   return ($allSets, $cmdlist, $txt);
 }
 
+#####################################
+# This has to be modularized in the future.
+sub
+WeatherAsHtml($)
+{
+  my ($d) = @_;
+  $d = "<none>" if(!$d);
+  return "$d is not a Weather instance<br>"
+        if(!$defs{$d} || $defs{$d}{TYPE} ne "Weather");
+  my $imgHome="http://www.google.com";
+
+  my $ret = "<table>";
+  $ret .= sprintf('<tr><td><img src="%s%s"></td><td>%s<br>temp %s, hum %s, %s</td></tr>',
+        $imgHome, ReadingsVal($d, "icon", ""),
+        ReadingsVal($d, "condition", ""),
+        ReadingsVal($d, "temp_c", ""), ReadingsVal($d, "humidity", ""),
+        ReadingsVal($d, "wind_condition", ""));
+
+  for(my $i=1; $i<=4; $i++) {
+    $ret .= sprintf('<tr><td><img src="%s%s"></td><td>%s: %s<br>min %s max %s</td></tr>',
+        $imgHome, ReadingsVal($d, "fc${i}_icon", ""),
+        ReadingsVal($d, "fc${i}_day_of_week", ""),
+        ReadingsVal($d, "fc${i}_condition", ""),
+        ReadingsVal($d, "fc${i}_low_c", ""), ReadingsVal($d, "fc${i}_high_c", ""));
+  }
+
+  $ret .= "</table>";
+  return $ret;
+}
+
 1;