diff --git a/ChangeLog b/ChangeLog
index 0ca905fb2..b291324fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-07  Glenn Morris  <rmg@gnu.org>
+
+	(org-agenda-sunrise-sunset): Require solar.
+	(calendar-longitude, calendar-latitude, calendar-location-name):
+	Declare for compiler.
+
 2008-03-07  Bastien Guerry  <bzg@altern.org>
 
 	* org-export-latex.el (org-export-as-latex): Revert the change
@@ -41,7 +47,7 @@
 
 2008-03-05  Carsten Dominik  <dominik@science.uva.nl>
 
-	* org.el "htmlize"): Removed hack to fix face problem with
+	* org.el "htmlize": Removed hack to fix face problem with
 	htmlize, it no longer seem necessary.
 
 2008-03-05  Bastien Guerry  <bzg@altern.org>
diff --git a/org.el b/org.el
index d01586c38..4498a1715 100644
--- a/org.el
+++ b/org.el
@@ -23648,12 +23648,17 @@ the cursor position."
   (interactive)
   (org-agenda-execute-calendar-command 'list-calendar-holidays))
 
+(defvar calendar-longitude)
+(defvar calendar-latitude)
+(defvar calendar-location-name)
+
 (defun org-agenda-sunrise-sunset (arg)
   "Display sunrise and sunset for the cursor date.
 Latitude and longitude can be specified with the variables
 `calendar-latitude' and `calendar-longitude'.  When called with prefix
 argument, latitude and longitude will be prompted for."
   (interactive "P")
+  (require 'solar)
   (let ((calendar-longitude (if arg nil calendar-longitude))
 	(calendar-latitude  (if arg nil calendar-latitude))
 	(calendar-location-name