diff --git a/ChangeLog b/ChangeLog
index c6a05a034..3e0423380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
            Thanks to Beka, Max Rossmannek.
 - TW #2101 Numeric UDA values above 2,147,483,647 overflow without warning
            Thanks to Adam Monsen.
+- TW #2136 Configuration options can be overwritten for current context
+           Thanks to Sebastian Uharek
 - TW #2208 Feature: added coloring of dates with scheduled tasks to calendar
            Thanks to Sebastian Uharek
 - TW #2247 Configuration override rc.verbose:off not respected
@@ -99,6 +101,7 @@
            Thanks to bharatvaj.
 - TW #2581 Config entry with a trailing comment cannot be modified
 
+
 ------ current release ---------------------------
 
 2.5.3 (2021-01-05) - 2f47226f91f0b02f7617912175274d9eed85924f
diff --git a/doc/man/task.1.in b/doc/man/task.1.in
index 95d952dd8..991fb54ee 100644
--- a/doc/man/task.1.in
+++ b/doc/man/task.1.in
@@ -1322,6 +1322,11 @@ the user intention here, and instead, the user is expected to set the
 Note how read and write contexts differ for context "family", while for context
 "home" they stay the same.
 
+In addition, every configuration parameter can be overridden for the current 
+context, by specifying context.<name>.rc.<parameter>. For example, if the default
+command for the family context should be displaying the family_report:
+
+    $ task config context.family.rc.default.command family_report
 
 .SH COMMAND ABBREVIATION
 All Taskwarrior commands may be abbreviated as long as a unique prefix is used,
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 69d1502f5..090b26b63 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -1480,9 +1480,15 @@ Stores the value of the currently active context.
 .RE
 
 .TP
-.B context.<name>=<filter>
+.B context.<name>.<type>=<filter>
 .RS
-Stores the definition of the context with the name <name>.
+Stores the definition of the context for type <type> with the name <name>. The
+type can either be read, write or rc. For details of the read and write types,
+please see the task(1) man page. The rc type allows to override any configuration
+parameter for the current context, e.g. if the default command for the context
+home should be changed to home_report, the following statement could be added:
+
+context.home.rc.default.command=home_report
 .RE
 
 .SS SYNC
diff --git a/src/libshared b/src/libshared
index 591fa58f9..fb7e7dcff 160000
--- a/src/libshared
+++ b/src/libshared
@@ -1 +1 @@
-Subproject commit 591fa58f9c684e22a3a55dbf71bdd00c25ceb28d
+Subproject commit fb7e7dcffd397d214f2e71f3ff5de27ac907774f