diff --git a/CHANGES.rst b/CHANGES.rst
index 60d47f73fb..3271c0acae 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,10 @@ Notes:
 ------
 - This python package specifies the version numbers only of directly imported python packages. This approach may result in a build failure of older versions of the project if incompatibilities arise between imported packages over time. The build process of the master branch is regularly tested in an automatic process.
 
+master
+------
+- Support Oereblex API version 1.2.5 via geolink-formatter 2.0.6 (#2081)
+
 2.5.4
 -----
 - New parameter default_toc_length to define a default table of content pages number (#2042)
diff --git a/dev/config/pyramid_oereb.yml.mako b/dev/config/pyramid_oereb.yml.mako
index 079a06f913..774c652d44 100644
--- a/dev/config/pyramid_oereb.yml.mako
+++ b/dev/config/pyramid_oereb.yml.mako
@@ -89,11 +89,11 @@ pyramid_oereb:
     # not set it will assume that only one TOC page exists, and this can lead to wrong numbering in the TOC, which
     # will be fixed by a second PDF extract call that has an impact on performance.
     compute_toc_pages: false
-    # In order to skip the computation of the estimated number of TOC pages which might return an erroneous result 
-    # for your setting, you can specify a default for the number of TOC pages. For most of the cantons the number of 
+    # In order to skip the computation of the estimated number of TOC pages which might return an erroneous result
+    # for your setting, you can specify a default for the number of TOC pages. For most of the cantons the number of
     # TOC pages is pretty constant unless a real estate is concerned by none or a huge number of restrictions.
-    # In both cases (computing an estimate or setting a default for the number of TOC pages) the exact number of TOC 
-    # pages is extracted from the created PDF and if it differs from the expected value the PDF is created a second 
+    # In both cases (computing an estimate or setting a default for the number of TOC pages) the exact number of TOC
+    # pages is extracted from the created PDF and if it differs from the expected value the PDF is created a second
     # time with the correct page numbers.
     # Note that if "compute_toc_pages" is set true the "expected_toc_length" is not taken into account.
     expected_toc_length: 2
@@ -180,7 +180,7 @@ pyramid_oereb:
     # OEREBlex host
     host: https://oereblex.sg.ch
     # geoLink schema version
-    version: 1.2.2
+    version: 1.2.5
     # Pass schema version in URL
     pass_version: true
     # Enable/disable XML validation
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index 00c41de280..940fc55b50 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -6,6 +6,10 @@ Changes/Hints for migration
 This chapter will give you hints on how to handle version migration, in particular regarding what you may need
 to adapt in your project configuration, database etc. when upgrading to a new version.
 
+master
+------
+- Support of Oereblex API version 1.2.5 via geolink-formatter 2.0.6 added (#2081). The oereblex schema version that is used to download oereblex xmls can be set in the file pyramid_oereb.yaml.
+
 Version 2.5.4
 -------------
 Feature and maintenance release:
@@ -104,7 +108,7 @@ Maintenance release:
 
 * Add support for newest oereblex API (via geolink-formatter, #1703)
 * Various minor library upgrades (SQLAlchemy, geoalchemy, psycopg2, pypdf)
-  
+
 
 Version 2.4.2
 -------------
@@ -177,7 +181,7 @@ Version 2.2.4
 -------------
 New functionality for configuring tolerance (optional):
 
-* Support tolerance per geometry type (#1603). See example definitions in the example project configuration file. 
+* Support tolerance per geometry type (#1603). See example definitions in the example project configuration file.
 * Library updates (#1604)
 
 .. _changes-version-2.2.3: