diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b94e3..ff75883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.6.1 - 2020-07-16
+
+### Fixed
+
+ - Compatibility with Ruby < 2.6 due to usage of [new `Hash#merge(*others)` with multiple arguments](https://rubyreferences.github.io/rubychanges/2.6.html#hashmerge-with-multiple-arguments) in 0.6.0. [@Envek]
+
 ## 0.6.0 - 2020-07-15
 
 ### Added
diff --git a/lib/yabeda/tags.rb b/lib/yabeda/tags.rb
index d86e223..b83d4a5 100644
--- a/lib/yabeda/tags.rb
+++ b/lib/yabeda/tags.rb
@@ -4,7 +4,7 @@ module Yabeda
   # Class to merge tags
   class Tags
     def self.build(tags)
-      ::Yabeda.default_tags.merge(Yabeda.temporary_tags, tags)
+      ::Yabeda.default_tags.merge(Yabeda.temporary_tags).merge(tags)
     end
   end
 end
diff --git a/lib/yabeda/version.rb b/lib/yabeda/version.rb
index 9448500..72d8492 100644
--- a/lib/yabeda/version.rb
+++ b/lib/yabeda/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yabeda
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end