diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php
index 5f968be83a..c8c0f6d2d7 100644
--- a/calendar/inc/header.inc.php
+++ b/calendar/inc/header.inc.php
@@ -19,7 +19,7 @@
    </a>
   </td>
   <td align="right">
-   <form action="<?php echo $phpgw_info["server"]["app_root"]; ?>/search.php">
+   <form action="search.php">
     <?php echo $phpgw->session->hidden_var(); ?>
     <input type="hidden" name="from" value="<?php echo $PHP_SELF; ?>">
     <input type="hidden" name="date" value="<?php echo $date; ?>">
diff --git a/calendar/search.php b/calendar/search.php
index f855652904..693f9095fa 100755
--- a/calendar/search.php
+++ b/calendar/search.php
@@ -16,17 +16,16 @@
 
   $phpgw_flags["currentapp"] = "calendar";
 
-  include("../header.inc.php");
-
   if (! $keywords) {
      // If we reach this it becuase they didn't search for anything,
      // attempt to send them back to where they where.
      Header("Location: $from?sessionid=" . $phpgw->session->id . "&date=$date"
 	  . "month=$month&day=$day&year=$year");
-  } else {	// else keywords
-     $phpgw->common->header();
+  }
 
-     $error = "";
+  include("../header.inc.php");
+
+  $error = "";
 
   if (strlen($keywords) == 0)
      $error = lang_calendar("You must enter one or more search keywords.");
@@ -88,10 +87,9 @@
      echo $error;
   }
 
- } // End else keywords
 ?>
 
 <P>
 <?php 
   include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
-?>
+
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 1d9448868a..12827de5fe 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -12,8 +12,10 @@
 	     friendly version.
 	   - Fixed a problem with the groups directory not being deleted.
 	   - Fixed a problem with not being able to add users to a group.
-	   - Fixed bad link in calendar
+	   - Fixed bad links in calendar
 	   - Added feature to be able to remove users from a group automaticly
+	   - changetheme.php will now read the files in the directory.  You no longer
+	     need to edit it to add themes
 
 [08152000] - Fixed a problem with the calendar not showing the months in the users
 	     langague preference.