diff --git a/yang/clixon/Makefile.in b/yang/clixon/Makefile.in
index 980a3298..e903a2ee 100644
--- a/yang/clixon/Makefile.in
+++ b/yang/clixon/Makefile.in
@@ -42,7 +42,7 @@ datarootdir     = @datarootdir@
 YANG_INSTALLDIR   = @YANG_INSTALLDIR@
 
 # Note: mirror these to test/config.sh.in
-YANGSPECS	 = clixon-config@2022-11-01.yang   # 6.0
+YANGSPECS	 = clixon-config@2022-12-01.yang   # 6.1
 YANGSPECS	+= clixon-lib@2021-12-05.yang      # 5.5
 YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
 YANGSPECS	+= clixon-xml-changelog@2019-03-21.yang
diff --git a/yang/clixon/clixon-config@2022-11-01.yang b/yang/clixon/clixon-config@2022-11-01.yang
index 63cb5528..42f7f469 100644
--- a/yang/clixon/clixon-config@2022-11-01.yang
+++ b/yang/clixon/clixon-config@2022-11-01.yang
@@ -51,7 +51,7 @@ module clixon-config {
             "Added option:
                     CLICON_NETCONF_MONITORING
                     CLICON_NETCONF_MONITORING_LOCATION
-             Released in Clixon 6.1";
+             Released in Clixon 6.0";
     }
     revision 2022-03-21 {
         description
diff --git a/yang/clixon/clixon-config@2022-03-21.yang b/yang/clixon/clixon-config@2022-12-01.yang
similarity index 97%
rename from yang/clixon/clixon-config@2022-03-21.yang
rename to yang/clixon/clixon-config@2022-12-01.yang
index da65f012..da76fb52 100644
--- a/yang/clixon/clixon-config@2022-03-21.yang
+++ b/yang/clixon/clixon-config@2022-12-01.yang
@@ -46,6 +46,19 @@ module clixon-config {
 
        ***** END LICENSE BLOCK *****";
 
+    revision 2022-12-01 {
+        description
+            "Added option:
+                    CLICON_NETCONF_WITHDEFAULTS_REPORTALL
+             Released in Clixon 6.1";
+    }
+    revision 2022-11-01 {
+        description
+            "Added option:
+                    CLICON_NETCONF_MONITORING
+                    CLICON_NETCONF_MONITORING_LOCATION
+             Released in Clixon 6.0";
+    }
     revision 2022-03-21 {
         description
             "Added option:
@@ -537,6 +550,16 @@ module clixon-config {
                  RFC6242 for example.
                  This only applies to the external NETCONF";
         }
+        leaf CLICON_NETCONF_WITHDEFAULTS_REPORTALL{
+            type boolean;
+            default "false";
+            description
+                "This option controls the basic mode retrieval defined in:
+                     RFC 6243: With-defaults Capability for NETCONF
+                 NETCONF with-defaults basic mode retrieval is set as follows:
+                 If false, set to explicit (this is default)
+                 If true, set to report-all (this is backward-compatible)";
+        }
         leaf CLICON_RESTCONF_API_ROOT {
             type string;
             default "/restconf";
@@ -1061,6 +1084,7 @@ module clixon-config {
                  See also CLICON_YANG_LIBRARY and CLICON_MODULE_SET_ID";
             status obsolete;
         }
+
         leaf CLICON_MODULE_SET_ID {
             type string;
             default "0";
@@ -1073,6 +1097,21 @@ module clixon-config {
                  If CLICON_MODULE_LIBRARY_RFC7895 is enabled, it sets the modules-state/module-set-id 
                  instead";
         }
+        leaf CLICON_NETCONF_MONITORING {
+            type boolean;
+            default true;
+            description
+                "Enable Netconf monitoring support as state data according to RFC6022. 
+                 If enabled, netconf monitoring info will appear when doing netconf get or 
+                 restconf GET.";
+        }
+        leaf CLICON_NETCONF_MONITORING_LOCATION {
+            type string;
+            description
+                "Extra Netconf monitoring location directory where schemas can be retrieved
+                 apart from NETCONF.
+                 Only if CLICON_NETCONF_MONITORING";
+        }
         leaf CLICON_STREAM_DISCOVERY_RFC5277 {
             type boolean;
             default false;