diff --git a/calendar/index.php b/calendar/index.php
index 37ebcc70c2..d7ebbff6fa 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -141,7 +141,17 @@
          } else {
             echo " BGCOLOR=\"$CELLBG\">";
          }
+
          print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
+
+         $thirsday=$i+24*3600*4;
+         if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Sunday" && $j == 0) {
+            echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' .(int)((date("z",$thirsday)+7)/7) . '</a></font>';
+         }
+         if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Monday" && $j == 1) {
+            echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' . (int)((date("z",$thirsday)+7)/7) . '</a></font>';
+         }
+
          echo "</TD>\n";
       } else {
          echo "<TD></TD>\n";
diff --git a/calendar/week.php b/calendar/week.php
index 4ec629ceb1..795923459c 100755
--- a/calendar/week.php
+++ b/calendar/week.php
@@ -148,8 +148,17 @@
     else
        echo "BGCOLOR=\"$CELLBG\">";
 
-       print_date_entries($date,$hide_icons,$phpgw_info["user"]["sessionid"]);
+    print_date_entries($date,$hide_icons,$phpgw_info["user"]["sessionid"]);
 
+    //$date = $i + ($j * 24 * 3600);
+/*    $thirsday=$j+24*3600*4;
+    if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Sunday" && $j == 0) {
+       echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' .(int)((date("z",$thirsday)+7)/7) . '</a></font>';
+    }
+    if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Monday" && $j == 1) {
+       echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' . (int)((date("z",$thirsday)+7)/7) . '</a></font>';
+    }*/
+    
     echo "</TD>\n";
   }
 
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 98b1e54f6d..8664e5aef0 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,4 +1,4 @@
-[09--2000] - Fixed a few missing variables with templates.
+[0.9.1]    - Fixed a few missing variables with templates.
 	      - editing a product in the inventory program now forwards you back to the category
 		   you where in.
 	      - You can now use decimals in the inventory program.
@@ -24,6 +24,7 @@
 	      - Updated docs a great deal.
 	      - Group public items should now be working.
 		 - Fixed a wrong data type error when calling sort() on 1 folder.
+		 - Added week number in month view of calendar. (Patch by grasl)
 	      - A bunch of other minor bug fixes.
 
 [09072000] - Added print icon that allows you to print out a page without having