diff --git a/.gitignore b/.gitignore
index b397d17..ba5ec81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gdm-2.30.2.tar.bz2
 /gdm-3.0.4.tar.bz2
 /gdm-3.1.2.tar.xz
 /gdm-3.2.0.tar.xz
+/gdm-3.2.1.tar.xz
diff --git a/disable-fatal-criticals.patch b/disable-fatal-criticals.patch
deleted file mode 100644
index 8af6636..0000000
--- a/disable-fatal-criticals.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From fc6ee4aa6d71d2c448a9b62aca24ba318163c590 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 28 Jun 2011 12:51:51 -0400
-Subject: [PATCH] common: don't tank on criticals
-
-Tiny (or not so tiny) bugs in components below GDM in the stack
-can lead to critical warnings.
-
-In development releases, GDM by default will crash when encountering
-a critical warning.
-
-Losing the login screen is a big deal.  We shouldn't automatically subject
-our users to "can't log in" in order to highlight bugs in development
-releases.
-
-This commit removes fatal criticals by default.
----
- common/gdm-common.c                   |    9 ---------
- common/gdm-common.h                   |    1 -
- daemon/factory-slave-main.c           |    2 --
- daemon/main.c                         |    2 --
- daemon/product-slave-main.c           |    2 --
- daemon/session-worker-main.c          |    2 --
- daemon/simple-slave-main.c            |    2 --
- daemon/xdmcp-chooser-slave-main.c     |    2 --
- gui/simple-chooser/chooser-main.c     |    2 --
- gui/simple-chooser/gdm-host-chooser.c |    2 --
- gui/simple-greeter/greeter-main.c     |    2 --
- 11 files changed, 0 insertions(+), 28 deletions(-)
-
-diff --git a/common/gdm-common.c b/common/gdm-common.c
-index 7a4e26d..865341a 100644
---- a/common/gdm-common.c
-+++ b/common/gdm-common.c
-@@ -65,15 +65,6 @@ gdm_is_version_unstable (void)
-         return unstable;
- }
- 
--void
--gdm_set_fatal_warnings_if_unstable (void)
--{
--        if (gdm_is_version_unstable ()) {
--                g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
--                g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
--        }
--}
--
- gboolean
- gdm_get_pwent_for_name (const char     *name,
-                         struct passwd **pwentp)
-diff --git a/common/gdm-common.h b/common/gdm-common.h
-index 06300c8..41ddf1c 100644
---- a/common/gdm-common.h
-+++ b/common/gdm-common.h
-@@ -31,7 +31,6 @@
- G_BEGIN_DECLS
- 
- gboolean       gdm_is_version_unstable            (void);
--void           gdm_set_fatal_warnings_if_unstable (void);
- 
- int            gdm_wait_on_pid           (int pid);
- int            gdm_wait_on_and_kill_pid  (int pid,
-diff --git a/daemon/factory-slave-main.c b/daemon/factory-slave-main.c
-index 9caab1c..2441260 100644
---- a/daemon/factory-slave-main.c
-+++ b/daemon/factory-slave-main.c
-@@ -183,8 +183,6 @@ main (int    argc,
-         textdomain (GETTEXT_PACKAGE);
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         context = g_option_context_new (_("GNOME Display Manager Slave"));
-diff --git a/daemon/main.c b/daemon/main.c
-index 5b8d66b..2ffb779 100644
---- a/daemon/main.c
-+++ b/daemon/main.c
-@@ -543,8 +543,6 @@ main (int    argc,
- 
-         ret = 1;
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         context = g_option_context_new (_("GNOME Display Manager"));
-diff --git a/daemon/product-slave-main.c b/daemon/product-slave-main.c
-index b0ab03f..b8e4755 100644
---- a/daemon/product-slave-main.c
-+++ b/daemon/product-slave-main.c
-@@ -187,8 +187,6 @@ main (int    argc,
-         textdomain (GETTEXT_PACKAGE);
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         context = g_option_context_new (_("GNOME Display Manager Slave"));
-diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
-index 35b4463..9d40b8d 100644
---- a/daemon/session-worker-main.c
-+++ b/daemon/session-worker-main.c
-@@ -151,8 +151,6 @@ main (int    argc,
- 
-         g_type_init ();
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         /* Translators: worker is a helper process that does the work
-            of starting up a session */
-         context = g_option_context_new (_("GNOME Display Manager Session Worker"));
-diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
-index 7751b61..057492b 100644
---- a/daemon/simple-slave-main.c
-+++ b/daemon/simple-slave-main.c
-@@ -187,8 +187,6 @@ main (int    argc,
-         textdomain (GETTEXT_PACKAGE);
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         context = g_option_context_new (_("GNOME Display Manager Slave"));
-diff --git a/daemon/xdmcp-chooser-slave-main.c b/daemon/xdmcp-chooser-slave-main.c
-index f86ea89..ea54210 100644
---- a/daemon/xdmcp-chooser-slave-main.c
-+++ b/daemon/xdmcp-chooser-slave-main.c
-@@ -189,8 +189,6 @@ main (int    argc,
-         textdomain (GETTEXT_PACKAGE);
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         context = g_option_context_new (_("GNOME Display Manager Slave"));
-diff --git a/gui/simple-chooser/chooser-main.c b/gui/simple-chooser/chooser-main.c
-index ac1edd6..2978a23 100644
---- a/gui/simple-chooser/chooser-main.c
-+++ b/gui/simple-chooser/chooser-main.c
-@@ -233,8 +233,6 @@ main (int argc, char *argv[])
- 
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         gdm_log_init ();
-diff --git a/gui/simple-chooser/gdm-host-chooser.c b/gui/simple-chooser/gdm-host-chooser.c
-index 371ba28..1f5f9c6 100644
---- a/gui/simple-chooser/gdm-host-chooser.c
-+++ b/gui/simple-chooser/gdm-host-chooser.c
-@@ -232,8 +232,6 @@ main (int argc, char *argv[])
- 
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         gdm_log_init ();
-diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
-index aa165fa..a2c533e 100644
---- a/gui/simple-greeter/greeter-main.c
-+++ b/gui/simple-greeter/greeter-main.c
-@@ -252,8 +252,6 @@ main (int argc, char *argv[])
- 
-         setlocale (LC_ALL, "");
- 
--        gdm_set_fatal_warnings_if_unstable ();
--
-         g_type_init ();
- 
-         gdm_profile_start ("Initializing settings client");
--- 
-1.7.5.4
-
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index fb67040..0000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b7d107a0156f3c7e07524175d9d27e2d868b58ff Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 16 Jun 2011 12:33:01 -0400
-Subject: [PATCH] dconf: make show-actions lock down optional
-
-The key is no longer necessary in recent versions of
-gnome-power-manager.
----
- data/make-dconf-override-db.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
-index ca04852..252f6ef 100755
---- a/data/make-dconf-override-db.sh
-+++ b/data/make-dconf-override-db.sh
-@@ -11,7 +11,7 @@ eval `dbus-launch --sh-syntax`
- 
- trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
- 
--gsettings set org.gnome.power-manager show-actions false
-+gsettings set org.gnome.power-manager show-actions false || :
- 
- gsettings set org.gnome.desktop.a11y.keyboard enable true
- gsettings set org.gnome.desktop.background show-desktop-icons false
--- 
-1.7.5.1
-
diff --git a/fix-dconf-db-thing.patch b/fix-dconf-db-thing.patch
deleted file mode 100644
index f7c2b7f..0000000
--- a/fix-dconf-db-thing.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c820ecd211396c50b44d418b85c6510cad69b373 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 1 Jun 2011 10:49:18 -0400
-Subject: [PATCH 1/2] Revert "dconf: set XDG_CACHE_HOME along with
- XDG_CONFIG_HOME"
-
-This reverts commit 0b34e0e1414dd5f51329f31b199e21d9fc6824a7.
-
-It was wrong.  dconf uses both XDG_CACHE_HOME and
-XDG_CONFIG_HOME.
-
-They both need to exist and be distinct.
----
- data/make-dconf-override-db.sh |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
-index acffbfa..8f4dc6d 100755
---- a/data/make-dconf-override-db.sh
-+++ b/data/make-dconf-override-db.sh
-@@ -3,7 +3,6 @@
- set -e
- 
- export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD")
--export XDG_CACHE_HOME="$XDG_CONFIG_HOME"
- eval `dbus-launch --sh-syntax`
- 
- trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR
--- 
-1.7.5.1
-
-
-From d8d5455c617a22f79934f5351b8d8072e202e52a Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 1 Jun 2011 10:45:04 -0400
-Subject: [PATCH 2/2] dconf: set XDG_CACHE_HOME in addition to XDG_CONFIG_HOME
-
-If we don't set this, it will use the default which can
-cause weird behavior when building in a logged in session.
-(cherry picked from commit 7f6cc6b06d401cf466ed56ea8a0f849c619ab176)
----
- data/make-dconf-override-db.sh |   10 +++++++---
- 1 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
-index 8f4dc6d..ca04852 100755
---- a/data/make-dconf-override-db.sh
-+++ b/data/make-dconf-override-db.sh
-@@ -2,10 +2,14 @@
- 
- set -e
- 
--export XDG_CONFIG_HOME=$(mktemp -d --tmpdir="$PWD")
-+export TMPDIR=$(mktemp -d --tmpdir="$PWD")
-+export XDG_CONFIG_HOME="$TMPDIR/config"
-+export XDG_CACHE_HOME="$TMPDIR/cache"
-+mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME
-+
- eval `dbus-launch --sh-syntax`
- 
--trap 'rm -rf $XDG_CONFIG_HOME; kill $DBUS_SESSION_BUS_PID' ERR
-+trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
- 
- gsettings set org.gnome.power-manager show-actions false
- 
-@@ -51,6 +55,6 @@ gsettings set org.gnome.settings-daemon.plugins.xrandr active true
- gsettings set org.gnome.settings-daemon.plugins.xsettings active true
- 
- mv $XDG_CONFIG_HOME/dconf/user dconf-override-db
--rm -rf $XDG_CONFIG_HOME
-+rm -rf $TMPDIR
- 
- kill $DBUS_SESSION_BUS_PID
--- 
-1.7.5.1
-
diff --git a/gdm-3.0.0-fedora-logo.patch b/gdm-3.0.0-fedora-logo.patch
index 04f8488..11631c4 100644
--- a/gdm-3.0.0-fedora-logo.patch
+++ b/gdm-3.0.0-fedora-logo.patch
@@ -9,14 +9,3 @@
        <locale name="C">
          <short>Icon name to use for greeter logo</short>
          <long>Set to the themed icon name to use for the greeter logo.</long>
-diff -up gdm-3.0.0/data/make-dconf-override-db.sh.fedora-icon-theme gdm-3.0.0/data/make-dconf-override-db.sh
---- gdm-3.0.0/data/make-dconf-override-db.sh.fedora-icon-theme	2011-04-15 08:30:54.750455961 -0400
-+++ gdm-3.0.0/data/make-dconf-override-db.sh	2011-04-15 08:26:11.525996754 -0400
-@@ -13,6 +13,7 @@ gsettings set org.gnome.desktop.a11y.key
- gsettings set org.gnome.desktop.background show-desktop-icons false
- gsettings set org.gnome.desktop.default-applications.terminal exec '"/bin/true"'
- gsettings set org.gnome.desktop.interface toolkit-accessibility true
-+gsettings set org.gnome.desktop.interface icon-theme '"Fedora"'
- 
- gsettings set org.gnome.desktop.lockdown disable-application-handlers true
- gsettings set org.gnome.desktop.lockdown disable-command-line true
diff --git a/gdm-3.2.0-shell_check.patch b/gdm-3.2.0-shell_check.patch
deleted file mode 100644
index b366f4a..0000000
--- a/gdm-3.2.0-shell_check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
-From: György Balló <ballogy@freestart.hu>
-Date: Fri, 30 Sep 2011 21:48:40 +0000
-Subject: data: add back check for gnome-shell before running gdm-shell session
-
-Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
-
-This commit does a quick check to make sure gnome-shell is
-installed, and supports --gdm-mode. If either of those fail,
-then fall back to the old greeter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660409
----
-(limited to 'data/gdm-shell.session.in')
-
-diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
-index 3d408c3..496cc10 100644
---- a/data/gdm-shell.session.in
-+++ b/data/gdm-shell.session.in
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
---
-cgit v0.9.0.2
-
diff --git a/gdm.spec b/gdm.spec
index 3b9003a..bfb1c41 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,14 +14,14 @@
 
 Summary: The GNOME Display Manager
 Name: gdm
-Version: 3.2.0
-Release: 2%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
 URL: http://download.gnome.org/sources/gdm
 #VCS: git:git://git.gnome.org/gdm
-Source: http://download.gnome.org/sources/gdm/2.91/gdm-%{version}.tar.xz
+Source: http://download.gnome.org/sources/gdm/3.2/gdm-%{version}.tar.xz
 Source1: gdm-pam
 Source2: gdm-autologin-pam
 Source3: gdm-password.pam
@@ -31,7 +31,7 @@ Source6: gdm-smartcard-16.png
 Source7: gdm-smartcard-48.png
 Source8: gdm-fingerprint-16.png
 Source9: gdm-fingerprint-48.png
-Source10: polkit-gnome-authentication-agent-1.desktop
+Source10: org.gnome.login-screen.gschema.override
 
 Requires(pre): /usr/sbin/useradd
 
@@ -82,12 +82,12 @@ BuildRequires: dbus-glib-devel
 BuildRequires: GConf2-devel
 BuildRequires: pkgconfig(accountsservice) >= 0.6.3
 
-# these are all just for rebuilding dconf-override-db
-BuildRequires: dbus-x11
-BuildRequires: dconf
-BuildRequires: gnome-power-manager
-BuildRequires: gsettings-desktop-schemas
-BuildRequires: gnome-settings-daemon
+# these are all just for rewriting gdm.d/00-upstream-settings
+Requires(posttrans): dbus-x11
+Requires(posttrans): dconf
+Requires(posttrans): gnome-power-manager
+Requires(posttrans): gsettings-desktop-schemas
+Requires(posttrans): gnome-settings-daemon
 
 Provides: service(graphical-login) = %{name}
 
@@ -97,51 +97,51 @@ Requires: audit-libs >= %{libauditver}
 # how well this will work with generic logos, though
 Requires: system-icon-theme
 
-Patch0: fix-build.patch
-Patch1: disable-fatal-criticals.patch
-# Upstream 64e6b10f98fe7226a2f41807268dae3afa80236d : check for
-# gnome-shell before using it to do login (RH #743596)
-Patch2: gdm-3.2.0-shell_check.patch
+# Swallow up old fingerprint/smartcard plugins
+Requires:  fprintd-pam
+
+Obsoletes: gdm-plugin-smartcard < 1:3.2.1
+Provides: gdm-plugin-smartcard = %{epoch}:%{version}-%{release}
+
+Obsoletes: gdm-plugin-fingerprint < 1:3.2.1
+Provides: gdm-plugin-fingerprint = %{epoch}:%{version}-%{release}
 
 # Fedora-specific
 Patch98: plymouth.patch
 Patch99: gdm-3.0.0-fedora-logo.patch
 
-%package plugin-smartcard
-Summary:   GDM smartcard plugin
-Group:     User Interface/Desktops
-Requires:  gdm = %{epoch}:%{version}-%{release}
-Requires:  pam_pkcs11
+%package libs
+Summary: Client-side library to talk to gdm
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
-%package plugin-fingerprint
-Summary:   GDM fingerprint plugin
-Group:     User Interface/Desktops
-Requires:  gdm = %{epoch}:%{version}-%{release}
-Requires:  fprintd-pam
+%description libs
+The gdm-libs package contains libraries that can
+be used for writing custom greeters.
+
+%package devel
+Summary: Development files for gdm-libs
+Group: Development/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description devel
+The gdm-devel package contains headers and other
+files needed to build custom greeters.
 
 %description
 GDM provides the graphical login screen, shown shortly after boot up,
 log out, and when user-switching.
 
-%description plugin-smartcard
-The GDM smartcard plugin provides functionality necessary to use a smart card with GDM.
-
-%description plugin-fingerprint
-The GDM fingerprint plugin provides functionality necessary to use a fingerprint reader with GDM.
+%description devel
+Development files and headers for writing GDM greeters.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-build
-%patch1 -p1 -b .disable-fatal-criticals
-%patch2 -p1 -b .shell-check
 %patch98 -p1 -b .plymouth
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f
 
-# force regeneration
-rm data/dconf-override-db
-
 %build
 cp -f %{SOURCE1} data/gdm
 cp -f %{SOURCE2} data/gdm-autologin
@@ -175,6 +175,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostSession
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# add logo to shell greeter
+cp $RPM_SOURCE_DIR/org.gnome.login-screen.gschema.override $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
+
+# gets rebuilt in posttrans
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/gdm
+
 # docs go elsewhere
 rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
 
@@ -193,9 +199,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
 
-# temporarily manually copy this
-cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
-
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/gdm/greeter
 
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
@@ -279,6 +282,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %posttrans
+%{_libexecdir}/gdm-update-dconf-db gdm %{_datadir}/gdm/upstream-settings 00-upstream-settings
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files -f gdm.lang
@@ -304,8 +308,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gnome-session/sessions/gdm.session
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.fingerprint.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.display-manager.extensions.smartcard.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.override
 %{_datadir}/gdm/simple-greeter/extensions/unified/page.ui
 %{_libexecdir}/gdm-factory-slave
 %{_libexecdir}/gdm-host-chooser
@@ -315,6 +319,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libexecdir}/gdm-simple-greeter
 %{_libexecdir}/gdm-simple-slave
 %{_libexecdir}/gdm-xdmcp-chooser-slave
+%{_libexecdir}/gdm-update-dconf-db
 %{_sbindir}/gdm
 %{_sbindir}/gdm-binary
 %{_bindir}/gdmflexiserver
@@ -347,27 +352,45 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
 %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
-%{_localstatedir}/lib/gdm/.local/share/applications/mime-dummy-handler.desktop
-%{_localstatedir}/lib/gdm/.local/share/applications/mimeapps.list
+%dir %{_sysconfdir}/dconf/db/gdm.d/locks
+%dir %{_sysconfdir}/dconf/db/gdm.d
+%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
+%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
 %{_sysconfdir}/dconf/profile/gdm
-%{_sysconfdir}/dconf/db/gdm
-
-%files plugin-smartcard
-%defattr(-, root, root)
+%{_datadir}/gdm/upstream-settings
+%{_datadir}/icons/hicolor/*/*/*.png
 %config %{_sysconfdir}/pam.d/gdm-smartcard
 %dir %{_datadir}/gdm/simple-greeter/extensions/smartcard
 %{_datadir}/gdm/simple-greeter/extensions/smartcard/page.ui
 %{_libdir}/gdm/simple-greeter/extensions/libsmartcard.so
 %{_libexecdir}/gdm-smartcard-worker
-
-%files plugin-fingerprint
-%defattr(-, root, root)
 %config %{_sysconfdir}/pam.d/gdm-fingerprint
 %dir %{_datadir}/gdm/simple-greeter/extensions/fingerprint
 %{_datadir}/gdm/simple-greeter/extensions/fingerprint/page.ui
 %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 
+%files devel
+%dir %{_includedir}/gdm
+%dir %{_includedir}/gdm/greeter
+%{_includedir}/gdm/greeter/gdm-greeter-client.h
+%{_includedir}/gdm/greeter/gdm-greeter-sessions.h
+%{_datadir}/gir-1.0/GdmGreeter-1.0.gir
+%{_libdir}/pkgconfig/gdmgreeter.pc
+
+%files libs
+%{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
+
+%files devel
+%{_includedir}/gdm/greeter/gdm-greeter-client.h
+%{_includedir}/gdm/greeter/gdm-greeter-sessions.h
+%{_libdir}/pkgconfig/gdmgreeter.pc
+%{_datadir}/gir-1.0/GdmGreeter-1.0.gir
+
 %changelog
+* Tue Oct 18 2011 Ray Strode <rstrode@redhat.com> 3.2.1-1
+- Update to 3.2.1
+- Move plugins into main package
+
 * Wed Oct  5 2011 Adam Williamson <awilliam@redhat.com> - 1:3.2.0-2
 - shell_check.patch (upstream): re-add check for gnome-shell presence
   before using it to handle login (RH #743596)
diff --git a/org.gnome.login-screen.gschema.override b/org.gnome.login-screen.gschema.override
new file mode 100644
index 0000000..25faff3
--- /dev/null
+++ b/org.gnome.login-screen.gschema.override
@@ -0,0 +1,3 @@
+[org.gnome.login-screen]
+logo='/usr/share/fedora-logos/fedora_logo_darkbackground.svg'
+enable-smartcard-authentication=false
diff --git a/sources b/sources
index fc16157..e31d345 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34819420a3177fe18eac2154762ed996  gdm-3.2.0.tar.xz
+4a633187f27be68db5001abd21b211b7  gdm-3.2.1.tar.xz