diff --git a/AUTHORS b/AUTHORS
index 3cb2e526a..681ec89e5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -128,6 +128,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Kent R. Spillner
   Konstantin Vorobyev
   Tom Sydney Kerckhove
+  Lynoure Braakman
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index b491a1f5a..8667161eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,10 @@
           (thanks to Paul Beckingham)
 - TW-1772 Implementation of circular dependency detection is
           inefficient (thanks to Michael Meier).
-- TW-1788 Closing a reopened task does not update the end time (thanks
-          to Ralph Bean).
+- TW-1788 Closing a reopened task does not update the end time
+          (thanks to Ralph Bean).
+- Added 'juhannus' as a synonym for 'midsommarafton'
+          (thanks to Lynoure Braakman).
 - Removed deprecated 'alias._query' setting.
 
 ------ current release ---------------------------
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index d6f8d2f51..3a9670b91 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1048,6 +1048,8 @@ task ... due:pentecost
 task ... due:midsommar
 .br
 task ... due:midsommarafton
+.br
+task ... due:juhannus
 .RE
 
 .SS FREQUENCIES
diff --git a/src/Dates.cpp b/src/Dates.cpp
index a0b5035c2..a721b6a49 100644
--- a/src/Dates.cpp
+++ b/src/Dates.cpp
@@ -93,7 +93,7 @@ static void midsommar (struct tm* t)
 static void midsommarafton (struct tm* t)
 {
   t->tm_mon = 5;                          // June.
-  t->tm_mday = 19;                        // Saturday after 20th.
+  t->tm_mday = 19;                        // Friday after 19th.
   t->tm_hour = t->tm_min = t->tm_sec = 0; // Midnight.
   t->tm_isdst = -1;                       // Probably DST, but check.
 
@@ -491,7 +491,8 @@ bool namedDates (const std::string& name, Variant& value)
     value = Variant (mktime (t), Variant::type_date);
   }
 
-  else if (closeEnough ("midsommarafton", name, minimum))
+  else if (closeEnough ("midsommarafton", name, minimum) ||
+           closeEnough ("juhannus", name, minimum))
   {
     Variant valueNow = Variant (mktime (t), Variant::type_date);
     midsommarafton (t);
diff --git a/test/dates.t.cpp b/test/dates.t.cpp
index 0b1b9edc3..1075a0178 100644
--- a/test/dates.t.cpp
+++ b/test/dates.t.cpp
@@ -146,6 +146,7 @@ int main (int, char**)
   Variant var_false;      testInit (t, "false", var_false);
   Variant midsommar;      testInit (t, "midsommar", midsommar);
   Variant midsommarafton; testInit (t, "midsommarafton", midsommarafton);
+  Variant juhannus;       testInit (t, "juhannus", juhannus);
   Variant first;          testInit (t, "1st", first);
   Variant second;         testInit (t, "2nd", second);
   Variant third;          testInit (t, "3rd", third);
@@ -173,6 +174,7 @@ int main (int, char**)
   t.ok (easter < eastermonday,      "easter < eastermonday");
   t.ok (easter < midsommarafton,    "easter < midsommarafton");
   t.ok (midsommarafton < midsommar, "midsommarafton < midsommar");
+  t.ok (juhannus == midsommarafton, "juhannus == midsommarafton");
 
   return 0;
 }