diff --git a/Changelog b/Changelog
index 8642c09a..819299e3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+2.5.5: 2019-05-04
+    *        [blog] Use modified djangocms_blog module to not show "Category - ... " (MR!699)
+2.5.4: 2019-05-04
+    * #6124: [blog] Allow setting title, subtitle of the blog page by passing GET params (MR!698)
 2.5.3: 2019-04-20
     * #6561: [bills] Show mutiple line items in the invoice details (MR!697)
     * #6561: [bills] Link line item to a Stripe Plan (MR!697)
diff --git a/cms_templates/djangocms_blog/post_list.html b/cms_templates/djangocms_blog/post_list.html
index eb1ce71b..90712e16 100644
--- a/cms_templates/djangocms_blog/post_list.html
+++ b/cms_templates/djangocms_blog/post_list.html
@@ -6,14 +6,6 @@
 {% block content_blog %}
 <section class="blog-list">
   {% block blog_title %}
-  <header>
-    <h2>
-      {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
-      {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
-      {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
-      {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
-    </h2>
-  </header>
   {% endblock %}
   {% for post in post_list %}
   {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}
diff --git a/ungleich/templates/cms/ungleichch/_header_base.html b/ungleich/templates/cms/ungleichch/_header_base.html
index d32f72e6..3a27a503 100644
--- a/ungleich/templates/cms/ungleichch/_header_base.html
+++ b/ungleich/templates/cms/ungleichch/_header_base.html
@@ -28,9 +28,9 @@
 			{% endif %}
 
 
-		  <h1> {% page_attribute 'page_title'  %}  </h1>
+		  <h1>{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute 'page_title'  %}{% endif %}</h1>
 		  <hr class="small">
-		  <span class="subheading"> {% page_attribute 'meta_description' %}</span>
+		  <span class="subheading">{% if request.GET.page_subtitle %}{{request.GET.page_subtitle}}{% else %}{% page_attribute 'meta_description' %}{% endif %}</span>
 		</div>
       </div>
     </div>
diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html
index 25fdbdc6..513b8d1e 100644
--- a/ungleich/templates/cms/ungleichch/base_ungleich.html
+++ b/ungleich/templates/cms/ungleichch/base_ungleich.html
@@ -9,7 +9,7 @@
     <meta name="author" content="ungleich glarus ag">
     <title>
       {% block title %}
-      {% page_attribute "page_title" %}
+      {% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute "page_title" %}{% endif %}
       {% endblock %}
     </title>
     {% addtoblock "external-css" %}