diff --git a/.gitignore b/.gitignore
index b1a8d10..6b84a0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -363,3 +363,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.20.2.tar.xz
 /NetworkManager-1.20.4.tar.xz
 /NetworkManager-1.21.3.tar.xz
+/NetworkManager-1.21.90.tar.xz
diff --git a/NetworkManager.conf b/NetworkManager.conf
index a2bb0fd..6ee4797 100644
--- a/NetworkManager.conf
+++ b/NetworkManager.conf
@@ -22,7 +22,7 @@
 # the previous one.
 
 [main]
-#plugins=ifcfg-rh,ibft
+#plugins=ifcfg-rh
 
 
 [logging]
diff --git a/NetworkManager.spec b/NetworkManager.spec
index d93b95f..051b05a 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.22.0
-%global real_version 1.21.3
-%global release_version 0.1
+%global real_version 1.21.90
+%global release_version 0.2
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -34,6 +34,8 @@
 
 %global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
+%global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
+
 ###############################################################################
 
 %bcond_with meson
@@ -45,6 +47,7 @@
 %bcond_without ovs
 %bcond_without ppp
 %bcond_without nmtui
+%bcond_without nm_cloud_setup
 %bcond_without regen_docs
 %bcond_with    debug
 %bcond_with    test
@@ -125,7 +128,8 @@ Group: System Environment/Base
 License: GPLv2+ and LGPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
+#Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source: __SOURCE1__
 Source1: NetworkManager.conf
 Source2: 00-server.conf
 Source4: 20-connectivity-fedora.conf
@@ -205,6 +209,9 @@ BuildRequires: libndp-devel >= 1.0
 %if 0%{?with_modem_manager_1}
 BuildRequires: ModemManager-glib-devel >= 1.0
 %endif
+%if %{with wwan}
+BuildRequires: mobile-broadband-provider-info-devel
+%endif
 %if %{with nmtui}
 BuildRequires: newt-devel
 %endif
@@ -454,7 +461,7 @@ configurations using "/etc/sysconfig/network-scripts/rule-NAME" files
 (eg, to do policy-based routing).
 
 
-%if 0%{with_nmtui}
+%if %{with nmtui}
 %package tui
 Summary: NetworkManager curses-based UI
 Group: System Environment/Base
@@ -468,6 +475,19 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %endif
 
 
+%if %{with nm_cloud_setup}
+%package cloud-setup
+Summary: Automatically configure NetworkManager in cloud
+Group: System Environment/Base
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description cloud-setup
+Installs a nm-cloud-setup tool that can automatically configure
+NetworkManager in cloud setups. Currently only EC2 is supported.
+%endif
+
+
 %prep
 %autosetup -p1 -n NetworkManager-%{real_version}
 
@@ -522,6 +542,16 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %else
 	-Diwd=false \
 %endif
+%if %{with nmtui}
+	-Dnmtui=true \
+%else
+	-Dnmtui=false \
+%endif
+%if %{with nm_cloud_setup}
+	-Dnm_cloud_setup=true \
+%else
+	-Dnm_cloud_setup=false \
+%endif
 	-Dvapi=true \
 	-Dintrospection=true \
 %if %{with regen_docs}
@@ -638,6 +668,16 @@ intltoolize --automake --copy --force
 %else
 	--with-iwd=no \
 %endif
+%if %{with nmtui}
+	--with-nmtui=yes \
+%else
+	--with-nmtui=no \
+%endif
+%if %{with nm_cloud_setup}
+	--with-nm-cloud-setup=yes \
+%else
+	--with-nm-cloud-setup=no \
+%endif
 	--enable-vala=yes \
 	--enable-introspection \
 %if %{with regen_docs}
@@ -692,7 +732,7 @@ intltoolize --automake --copy --force
 
 make %{?_smp_mflags}
 
-%endif # end autotools
+%endif
 
 %install
 %if %{with meson}
@@ -750,7 +790,7 @@ make -k %{?_smp_mflags} check
 %else
 make -k %{?_smp_mflags} check || :
 %endif
-%endif # end autotools
+%endif
 
 
 %pre
@@ -779,6 +819,12 @@ else
 fi
 
 
+%if %{with nm_cloud_setup}
+%post cloud-setup
+%systemd_post %{systemd_units_cloud_setup}
+%endif
+
+
 %preun
 if [ $1 -eq 0 ]; then
     # Package removal, not upgrade
@@ -792,6 +838,12 @@ fi
 %systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 
+%if %{with nm_cloud_setup}
+%preun cloud-setup
+%systemd_preun %{systemd_units_cloud_setup}
+%endif
+
+
 %postun
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
@@ -805,6 +857,12 @@ fi
 %endif
 
 
+%if %{with nm_cloud_setup}
+%postun cloud-setup
+%systemd_postun %{systemd_units_cloud_setup}
+%endif
+
+
 %files
 %{dbus_sys_dir}/org.freedesktop.NetworkManager.conf
 %{dbus_sys_dir}/nm-dispatcher.conf
@@ -862,6 +920,8 @@ fi
 %{_datadir}/doc/NetworkManager/examples/server.conf
 %doc NEWS AUTHORS README CONTRIBUTING TODO
 %license COPYING
+%license COPYING.LGPL
+%license COPYING.GFDL
 
 
 %if %{with adsl}
@@ -971,7 +1031,20 @@ fi
 %endif
 
 
+%if %{with nm_cloud_setup}
+%files cloud-setup
+%{_libexecdir}/nm-cloud-setup
+%{systemd_dir}/nm-cloud-setup.service
+%{systemd_dir}/nm-cloud-setup.timer
+%{nmlibdir}/dispatcher.d/90-nm-cloud-setup.sh
+%{nmlibdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%endif
+
+
 %changelog
+* Fri Nov 29 2019 Thomas Haller <thaller@redhat.com> - 1:1.21.0-0.2
+- Update to 1.21.90 (1.22-rc1)
+
 * Sun Nov 03 2019 Lubomir Rintel <lkundrak@v3.sk> - 1:1.21.0-0.1
 - Update to an early 1.22.0 snapshot
 
diff --git a/sources b/sources
index 737aa2f..7e22b8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.21.3.tar.xz) = 12b0717e8bf5c697f6d350bcf22f9f2b1adc74140d0e653e7323511b592cd0090e26c88611c56f8c9be3c27ee839a802d2d59f9482fb0e247f88c1c3f07fc62c
+SHA512 (NetworkManager-1.21.90.tar.xz) = 487450a874b5d7046118a09f221e641fadeb8782bf7b537181a93d74d5edf84e8b62162a9459a6f8148408351bb1d7e8d00e22099da3eb5b2d5b0d658a8ad0c5