diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset
index 735dc92..b9104e4 100644
--- a/rtems/config/4.11/rtems-avr.bset
+++ b/rtems/config/4.11/rtems-avr.bset
@@ -28,6 +28,11 @@
 #
 %define enable_cxx 0
 
+#
+# Disable building ICONV support
+#
+%define with_iconv 0
+
 #
 # Set the build flags to work around the defaults in the
 # compiler that cause ICE.
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index c63b9ca..5ff2021 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -160,6 +160,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
     --disable-lto \
     --enable-newlib-io-c99-formats \
     %{?with_iconv:--enable-newlib-iconv} \
+    %{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \
     %{?with_threads:--enable-threads}%{!?with_threads:--disable-threads} \
     %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
     %{?enable_obsolete:--enable-obsolete} \