diff --git a/configs/config-android.cmake b/configs/config-android.cmake
index 17e3a618e82548c4d1522c3a9a22acc467a4dcef..8ff5416bbd76dec7589a0847bff03eab1ed2b109 100644
--- a/configs/config-android.cmake
+++ b/configs/config-android.cmake
@@ -36,6 +36,8 @@ set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
diff --git a/configs/config-desktop-raspberry.cmake b/configs/config-desktop-raspberry.cmake
index f963873cd17200db424eebf65c88b84d2552eeb9..e110b3b4dec09212f6ef3083836e0f87c9083190 100644
--- a/configs/config-desktop-raspberry.cmake
+++ b/configs/config-desktop-raspberry.cmake
@@ -25,6 +25,8 @@ set(DEFAULT_VALUE_ENABLE_BV16 ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_GTK_UI OFF)
 set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
diff --git a/configs/config-desktop.cmake b/configs/config-desktop.cmake
index 9d384a1dbaa9413a729e3a8e1675126eea632dde..50caa931c7428eda8217badecac9a03609535f28 100644
--- a/configs/config-desktop.cmake
+++ b/configs/config-desktop.cmake
@@ -25,6 +25,8 @@ set(DEFAULT_VALUE_ENABLE_BV16 ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_GTK_UI ON)
 set(DEFAULT_VALUE_ENABLE_JPEG ON)
 set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
diff --git a/configs/config-ios.cmake b/configs/config-ios.cmake
index f538356b5897e1f69274c7485d44ecd2f6d37cb6..c5e60579b8f85bf7b2ee497d65abc6f2ea1570fa 100644
--- a/configs/config-ios.cmake
+++ b/configs/config-ios.cmake
@@ -32,6 +32,8 @@ set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF) #link of binary significantly slow down compilation.
 set(DEFAULT_VALUE_ENABLE_VCARD ON)
diff --git a/configs/config-python.cmake b/configs/config-python.cmake
index 4a58a22442582d92be136e1563ba28af2cb195f8..09eba3ed5cb2997fbc6f65764dbc8eda1ffd3558 100644
--- a/configs/config-python.cmake
+++ b/configs/config-python.cmake
@@ -24,6 +24,8 @@
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
diff --git a/configs/config-windowsphone.cmake b/configs/config-windowsphone.cmake
index 6b18f8b9ed4d432f0d646f0a039bb53a8861dcdc..1cb1553814e5cd28ef5909e828e2851ee8f589b5 100644
--- a/configs/config-windowsphone.cmake
+++ b/configs/config-windowsphone.cmake
@@ -24,6 +24,8 @@
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_G729 ON)
+set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
 set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
diff --git a/options/ms2.cmake b/options/ms2.cmake
index 00e18fd9f73f48bd195ccd0134e36615d87a16cd..2fb6edb617adf09bfd1c6be84b1906f788deda3b 100644
--- a/options/ms2.cmake
+++ b/options/ms2.cmake
@@ -35,8 +35,8 @@ lcb_add_dependent_option("WASAPI" "Windows Audio Session API (WASAPI) sound card
 lcb_add_strict_dependent_option("AMRNB" "AMR narrow-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_strict_dependent_option("AMRWB" "AMR wide-band audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_option("Codec2" "Codec2 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_CODEC2}")
-lcb_add_strict_dependent_option("G729" "G.729 audio encoding/decoding support (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
-lcb_add_strict_dependent_option("G729B CNG" "G.729 annex B confort noise generation (require license)." OFF ON OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
+lcb_add_option("G729" "G.729 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_G729}")
+lcb_add_option("G729B CNG" "G.729 annex B confort noise generation." "${DEFAULT_VALUE_ENABLE_G729B_CNG}")
 lcb_add_option("G726" "G.726 audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_G726}")
 lcb_add_option("GSM"  "GSM audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_GSM}")
 lcb_add_option("iLBC"  "iLBC audio encoding/decoding support." "${DEFAULT_VALUE_ENABLE_ILBC}")