diff --git a/config/agenda.org b/config/diary.org
similarity index 57%
rename from config/agenda.org
rename to config/diary.org
index 2d17917..61a5d4c 100644
--- a/config/agenda.org
+++ b/config/diary.org
@@ -1,14 +1,22 @@
-#+title: Agenda config
+#+title: Diary and Calendar config
 #+author: Evie Litherland-Smith
 #+email: evie@xenia.me.uk
 #+language: en
 #+filetags: :emacs:config:org:
 #+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent
+* Diary
+#+begin_src emacs-lisp
+  (setopt diary-file (locate-user-emacs-file "diary/main.gpg")
+          diary-display-function #'diary-fancy-display)
+  (add-hook 'diary-list-entries-hook #'diary-include-other-diary-files)
+  (add-hook 'diary-list-entries-hook #'diary-sort-entries t)
+  (add-hook 'diary-mark-entries-hook #'diary-mark-included-diary-files)
+#+end_src
 * Calendar
 #+begin_src emacs-lisp
   (setopt calendar-date-style 'iso
-          calendar-mark-holidays-flag t
-          calendar-mark-diary-entries-flag nil)
+          calendar-view-holidays-initially-flag t
+          calendar-view-diary-initially-flag t)
 #+end_src
 * Appointment reminders
 #+begin_src emacs-lisp
diff --git a/config/org-mode.org b/config/org-mode.org
index 2977342..2be6642 100644
--- a/config/org-mode.org
+++ b/config/org-mode.org
@@ -142,8 +142,8 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
         org-agenda-sticky nil
         org-agenda-window-setup 'current-window
         org-agenda-tags-column 0
-        org-agenda-diary-file (expand-file-name "diary.org" org-directory)
-        org-agenda-include-diary nil
+        org-agenda-diary-file 'diary-file
+        org-agenda-include-diary t
         org-agenda-include-deadlines t
         org-agenda-todo-ignore-scheduled 'future
         org-agenda-todo-ignore-deadlines 'far
diff --git a/diary/birthdays.gpg b/diary/birthdays.gpg
new file mode 100644
index 0000000..e395af7
Binary files /dev/null and b/diary/birthdays.gpg differ
diff --git a/diary/main.gpg b/diary/main.gpg
new file mode 100644
index 0000000..62c44ab
Binary files /dev/null and b/diary/main.gpg differ