--- usr/www/all/templates/menu_page_end.html
+++ usr/www/all/templates/menu_page_end.html
@@ -31,9 +31,10 @@
 box.out([[<a class="nocancel" href=']]..config.NEWSLETTER_URL..[[' target='_blank'>{?22:606?}</a> | ]])
 end
 if (config.language=="de") then
-box.out([[<a class="nocancel" href='http://www.avm.de' target='_blank' style='margin-right:0px;'>avm.de</a> ]])
+box.out([[<a class="nocancel" href='http://www.avm.de' target='_blank'>www.avm.de</a> | ]])
 else
-box.out([[<a class="nocancel" href='http://www.avm.de/en' target='_blank' style='margin-right:0px;'>avm.de</a> ]])
+box.out([[<a class="nocancel" href='http://www.avm.de/en' target='_blank'>www.avm.de</a> | ]])
 end
+box.out([[<a class="nocancel" href='http://freetz.org' target='_blank' style='margin-right:0px;'>freetz.org</a> ]])
 ?>
 </div>
--- usr/www/all/templates/menu_page_head.html
+++ usr/www/all/templates/menu_page_head.html
@@ -31,5 +31,8 @@
 menu.write_menu('livetv')
 box.out([[</div>]])
 end
+box.out([[<div id="MainFreetzhead" class='main_menu_bubble'>]])
+menu.write_menu('freetz')
+box.out([[</div>]])
 ?>
 </div>
--- usr/www/all/menus/menu_data.lua
+++ usr/www/all/menus/menu_data.lua
@@ -1266,6 +1266,10 @@
 function getMenuData()
 local pageData, expertMode = getPageData()
 local checkedIds = {}
+
+-- TODO: find out how to check if Freetz WOL files are avalaible
+local freetzWolInstalled = false
+
 local menuData = {
 ["overview"] = pageData["overview"] and {
 ["txt"] = TXT([[{?menuOverview?}]]),
@@ -2192,6 +2196,16 @@
 ["lnk"] = pageData["liveTv"].lnk,
 ["pos"] = -65
 } or nil,
+["freetz-wol"] = (freetzWolInstalled) and {
+["txt"] = "Freetz WOL",
+["lnk"] = "/cgi-bin/freetz_wol",
+["pos"] = -55
+} or nil,
+["freetz"] = {
+["txt"] = "Freetz",
+["lnk"] = "/cgi-bin/freetz_status",
+["pos"] = -60
+},
 ["nas"] = config.NAS and {
 ["txt"] = TXT([[{?757:400?}]]),
 ["lnk"] = "nas",