diff --git a/gdm-2.23.1-fedora-logo.patch b/gdm-2.23.1-fedora-logo.patch
deleted file mode 100644
index 11631c4..0000000
--- a/gdm-2.23.1-fedora-logo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in.fedora-logo 2008-07-21 11:14:46.000000000 -0400
-+++ gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-07-21 14:59:17.000000000 -0400
-@@ -39,7 +39,7 @@
- /apps/gdm/simple-greeter/logo_icon_name
- gdm-simple-greeter
- string
-- computer
-+ start-here
-
- Icon name to use for greeter logo
- Set to the themed icon name to use for the greeter logo.
diff --git a/gdm-3.0.0-fedora-logo.patch b/gdm-3.0.0-fedora-logo.patch
new file mode 100644
index 0000000..04f8488
--- /dev/null
+++ b/gdm-3.0.0-fedora-logo.patch
@@ -0,0 +1,22 @@
+--- gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in.fedora-logo 2008-07-21 11:14:46.000000000 -0400
++++ gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-07-21 14:59:17.000000000 -0400
+@@ -39,7 +39,7 @@
+ /apps/gdm/simple-greeter/logo_icon_name
+ gdm-simple-greeter
+ string
+- computer
++ start-here
+
+ Icon name to use for greeter logo
+ Set to the themed icon name to use for the greeter logo.
+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.spec b/gdm.spec
index e08e21f..28acc86 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 3.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -86,11 +86,15 @@ Provides: service(graphical-login) = %{name}
Requires: audit-libs >= %{libauditver}
+# For the Fedora logo in the greeter, not sure
+# how well this will work with generic logos, though
+Requires: system-icon-theme
+
Patch2: plymouth.patch
Patch96: gdm-multistack.patch
# Fedora-specific
-Patch99: gdm-2.23.1-fedora-logo.patch
+Patch99: gdm-3.0.0-fedora-logo.patch
%package plugin-smartcard
Summary: GDM smartcard plugin
@@ -354,6 +358,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Fri Apr 15 2011 Matthias Clasen - 3.0.0-2
+- Put the Fedora logo back in the greeter
+
* Mon Apr 4 2011 Matthias Clasen - 3.0.0-1
- Update to 3.0.0