diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
index 0cade7a1c6..f03db0c0ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
@@ -123,7 +123,7 @@
                                                 <input type="checkbox" name="allBranches" id="allBranches" />
                                                 <label for="allBranches">Copy changes to all libraries</label>.
                                                 <a href="#" class="helptext">[?]</a>
-                                                <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, no change is made.</div>
+                                                <div class="hint">If checked, changes for this holiday will be copied to all libraries. If the holiday doesn't exists for a library, holiday is added to calendar. NOTE! This might overwrite existing holidays in other calendars.</div>
                                             </li>
                                         </ol>
                                         <fieldset class="action">
diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl
index a96b1d0ebb..bdfd6d2313 100755
--- a/tools/exceptionHolidays.pl
+++ b/tools/exceptionHolidays.pl
@@ -86,27 +86,83 @@ sub edit_holiday {
                 }
             }
     } elsif ($showoperation eq 'edit') {
-        if($holidaytype eq 'weekday') {
-        $calendar->ModWeekdayholiday(weekday => $weekday,
-                                    title => $title,
-                                    description => $description);
-        } elsif ($holidaytype eq 'daymonth') {
-        $calendar->ModDaymonthholiday(day => $day,
-                                        month => $month,
-                                        title => $title,
-                                        description => $description);
-        } elsif ($holidaytype eq 'ymd') {
-        $calendar->ModSingleholiday(day => $day,
-                                    month => $month,
-                                    year => $year,
-                                    title => $title,
-                                    description => $description);
-        } elsif ($holidaytype eq 'exception') {
-        $calendar->ModExceptionholiday(day => $day,
-                                    month => $month,
-                                    year => $year,
-                                    title => $title,
-                                    description => $description);
+        if ( $holidaytype eq 'weekday' ) {
+            my $isHoliday = $calendar->isHoliday( $day, $month, $year );
+            if ($isHoliday) {
+                $calendar->ModWeekdayholiday(
+                    weekday     => $weekday,
+                    title       => $title,
+                    description => $description
+                );
+            }
+            else {
+                $calendar->insert_week_day_holiday(
+                    weekday     => $weekday,
+                    title       => $title,
+                    description => $description
+                );
+            }
+        }
+        elsif ( $holidaytype eq 'daymonth' ) {
+            my $isHoliday = $calendar->isHoliday( $day, $month, $year );
+            if ($isHoliday) {
+                $calendar->ModDaymonthholiday(
+                    day         => $day,
+                    month       => $month,
+                    title       => $title,
+                    description => $description
+                );
+            }
+            else {
+                $calendar->insert_day_month_holiday(
+                    day         => $day,
+                    month       => $month,
+                    title       => $title,
+                    description => $description
+                );
+            }
+        }
+        elsif ( $holidaytype eq 'ymd' ) {
+            my $isHoliday = $calendar->isHoliday( $day, $month, $year );
+            if ($isHoliday) {
+                $calendar->ModSingleholiday(
+                    day         => $day,
+                    month       => $month,
+                    year        => $year,
+                    title       => $title,
+                    description => $description
+                );
+            }
+            else {
+                $calendar->insert_single_holiday(
+                    day         => $day,
+                    month       => $month,
+                    year        => $year,
+                    title       => $title,
+                    description => $description
+                );
+            }
+        }
+        elsif ( $holidaytype eq 'exception' ) {
+            my $isHoliday = $calendar->isHoliday( $day, $month, $year );
+            if ($isHoliday) {
+                $calendar->ModExceptionholiday(
+                    day         => $day,
+                    month       => $month,
+                    year        => $year,
+                    title       => $title,
+                    description => $description
+                );
+            }
+            else {
+                $calendar->insert_exception_holiday(
+                    day         => $day,
+                    month       => $month,
+                    year        => $year,
+                    title       => $title,
+                    description => $description
+                );
+            }
         }
     } elsif ($showoperation eq 'delete') {
         $calendar->delete_holiday(weekday => $weekday,