diff --git a/configuration.org b/configuration.org
index cba8743..613dfcf 100644
--- a/configuration.org
+++ b/configuration.org
@@ -1566,14 +1566,22 @@ For some strange reason having this at the end of my configuration can cause une
 #+BEGIN_SRC emacs-lisp
 (use-package calendar
   :ensure nil
-  :init
-  (setq calendar-week-start-day 1
-        calendar-latitude 47.4
-        calendar-longitude 19.0
-        calendar-location-name "Budapest, Hungary"
-        calendar-time-zone 60
-        calendar-standard-time-zone-name "CET"
-        calendar-daylight-time-zone-name "CEST"))
+  :custom
+  (calendar-week-start-day 1))
+
+(use-package cal-dst
+  :ensure nil
+  :custom
+  (calendar-time-zone 60)
+  (calendar-standard-time-zone-name "CET")
+  (calendar-daylight-time-zone-name "CEST"))
+
+(use-package solar
+  :ensure nil
+  :custom
+  (calendar-latitude 47.4)
+  (calendar-longitude 19.0)
+  (calendar-location-name "Budapest, Hungary"))
 #+END_SRC
 
 *** Add the SysAdmin day to the calendar