diff --git a/calendar/day.php b/calendar/day.php
index aee4838bb6..6a6f1319e7 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -170,13 +170,14 @@ for ($i = $wkstart; date("Ymd", $i) <= date("Ymd", $monthend); $i += (24 * 3600
 
 <?php
   if (! $friendly) {
-     echo "<p><A HREF=\"".$phpgw->link("day.php");
+     $param = "";
      if ($thisyear)
-        echo "&year=$thisyear&month=$thismonth&day=$thisday";
+        $param .= "year=$thisyear&month=$thismonth&day=$thisday&";
 
-     ?>&friendly=1" TARGET="cal_printer_friendly" onMouseOver="window.status = '<?php echo lang("Generate printer-friendly version") . "'\">[" . lang("Printer Friendly"); ?>]</A>
-
-<?php 
+     $param .= "friendly=1\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
+	. "status = '" . lang("Generate printer-friendly version"). "'";
+     echo "<a href=\"".$phpgw->link($PHP_SELF,$param)."\">";
+     echo "[". lang("Printer Friendly") . "]</A>";
      include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
-   } 
+  }
 ?>
diff --git a/calendar/index.php b/calendar/index.php
index c694ccb31a..4e32892a9b 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -168,3 +168,4 @@
      echo "[". lang("Printer Friendly") . "]</A>";
      include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
   }
+?>