diff --git a/fhem/contrib/debianfhemde/scripts/templates/index.template b/fhem/contrib/debianfhemde/scripts/templates/index.template
index 600461ff1..12455e36a 100755
--- a/fhem/contrib/debianfhemde/scripts/templates/index.template
+++ b/fhem/contrib/debianfhemde/scripts/templates/index.template
@@ -1,10 +1,10 @@
 <html>
 <head>
-<!-- ==DATE== ==TIME== -->
+<!-- content created: ==DATE== ==TIME== -->
 <title>FHEM for Debian</title>
-<link rel="stylesheet" type="text/css"     href="../style/style.css"   />
+<link rel="stylesheet" type="text/css"     href="../style/style.css?v=1.0"   />
 <link rel="icon"       type="image/x-icon" href="./grafik/favicon.ico" />
-<meta http-equiv="pragma" content="no-cache" />
+<meta http-equiv="cache-control" content="no-cache" />
 </head>
 
 <body>
@@ -18,22 +18,22 @@
         <tr><td></td></tr>
         <tr><td><b>Content:</b></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/default.html'">Start</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/default.html?v===MINOR=='">Start</p></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/manual.html'">Manual installation</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/manual.html?v===MAJOR=='">Manual installation</p></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/stable.html'">Stable build using apt</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/nightly.html?v===MINOR=='">The easy way: use apt-get</p></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/nightly.html'">Nightly build using apt</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/configurator.html?v===MINOR=='">The comfortable way: FHEM configurator</p></td></tr>
         <tr><td></td></tr>
-<!--        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/https_trouble.html'">https Trouble?</p></td></tr>
-        <tr><td></td></tr> -->
-        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/gpg_trouble.html'">gpg key Trouble</p></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/https_trouble.html?v===MAJOR=='">https Trouble?</p></td></tr>
+        <tr><td></td></tr>
+        <tr><td><p class="a" onclick="parent.rightcontent.location.href='./html/gpg_trouble.html??v===MAJOR=='">gpg key Trouble?</p></td></tr>
         <tr><td></td></tr>
         <tr><td><hr/></td></tr>
         <tr><td><b>Nightly build:</b></td></tr>
         <tr><td></td></tr>
-        <tr><td><p class="asmall">Rev ==MAJOR==.==MINOR==<br/>==DATE== ==TIME==</p></td></tr>
+        <tr><td><p class="a_s">==DATE== ==TIME==</p><p class="a">Rev ==MAJOR==.==MINOR==</p></td></tr>
         <tr><td></td></tr>
         <tr><td><hr/></td></tr>
         <tr><td><b>Links:</b></td></tr>
@@ -49,10 +49,10 @@
       </table>
       </table>
     </div>
-    <div id="aws"></div>
+    <div id="nocookies" title="(C)SEK-2000"></div>
   </div>
 
-  <div id="right"><iframe id="rightcontent" name="rightcontent" style="border:0px;" width="100%" height="100%" src="./html/default.html"></iframe></div>
+  <div id="right"><iframe id="rightcontent" name="rightcontent" style="border:0px;" width="100%" height="100%" src="./html/default.html?v===MINOR=="></iframe></div>
   
 </body>
 </html>
diff --git a/fhem/contrib/debianfhemde/scripts/templates/manual.template b/fhem/contrib/debianfhemde/scripts/templates/manual.template
index 722d697bd..023fa0d28 100755
--- a/fhem/contrib/debianfhemde/scripts/templates/manual.template
+++ b/fhem/contrib/debianfhemde/scripts/templates/manual.template
@@ -5,7 +5,7 @@
 <script type="text/javascript"> 
    if (top == self) top.location = "../index.html";
 </script>
-<meta http-equiv="pragma" content="no-cache" />
+<meta http-equiv="cache-control" content="max-age=86400">
 </head>
 
 <body>
@@ -16,7 +16,7 @@
       <li>Install prerequisits:<br/><br/>
         <ul><code>apt-get -y install perl-base libdevice-serialport-perl libwww-perl libio-socket-ssl-perl libcgi-pm-perl libjson-perl sqlite3 libdbd-sqlite3-perl libtext-diff-perl libtimedate-perl libmail-imapclient-perl libgd-graph-perl libtext-csv-perl libxml-simple-perl liblist-moreutils-perl ttf-liberation libimage-librsvg-perl libgd-text-perl libsocket6-perl libio-socket-inet6-perl libmime-base64-perl libimage-info-perl libusb-1.0-0-dev libnet-server-perl</code></ul></li><br/>
       <li>Download latest stable package:<br/><br/>
-        <ul><code>wget http://debian.fhem.de/fhem-==MAJOR==.deb</code></ul></li><br/>
+        <ul><code>wget http://fhem.de/fhem-==MAJOR==.deb</code></ul></li><br/>
       <li>Install package:<br/><br/>
         <ul><code>dpkg -i fhem-==MAJOR==.deb</code></ul></li><br/>
       <li>If you want to add the fhem user manually, just run the following command::<br/><br/>
diff --git a/fhem/contrib/debianfhemde/scripts/templates/nightly.template b/fhem/contrib/debianfhemde/scripts/templates/nightly.template
index 9771c066b..6a5570cdc 100755
--- a/fhem/contrib/debianfhemde/scripts/templates/nightly.template
+++ b/fhem/contrib/debianfhemde/scripts/templates/nightly.template
@@ -5,13 +5,12 @@
 <script type="text/javascript"> 
    if (top == self) top.location = "../index.html";
 </script>
-<meta http-equiv="pragma" content="no-cache" />
+<meta http-equiv="cache-control" content="no-cache" />
 </head>
 
 <body>
-
     <a name="nightly"></a>
-    <h3>Nightly builds (use it at your own risk!)</h3>
+    <h3>The easy way: Use apt-get to install FHEM and all dependencies</h3>
     <ul>
       <li>Import repository gpg key:<br/><br/>
         <ul><code>wget -qO - http://debian.fhem.de/archive.key | apt-key add -</code></ul></li><br/>
@@ -23,10 +22,8 @@
         <ul><code>apt-get install fhem</code></ul></li><br/>
       <li>You will find a special version number like<br/><br/>
         <ul><code>Inst fhem (==MAJOR==.==MINOR==  debian.fhem.de [all])</code></ul><br/>
-	<ul>with <code>==MAJOR==</code> representing major version</ul>
+	<ul>with <code>==MAJOR==</code> representing the major version</ul>
         <ul>with <code>==MINOR==</code> representing the latest SVN commit included.</ul><br/>
-      <li>(optional) Remove repository from /etc/apt/sources.list:<br/></br>
-        <ul><code>#deb http://debian.fhem.de/nightly/ /</code></ul></li><br/>
     </ul>
     <br/>
 </body>
