diff --git a/gnome-screensaver-2.18.0-user-dirs.patch b/gnome-screensaver-2.18.0-user-dirs.patch
index babf9cb..1f1a6c1 100644
--- a/gnome-screensaver-2.18.0-user-dirs.patch
+++ b/gnome-screensaver-2.18.0-user-dirs.patch
@@ -10,7 +10,7 @@
  StartupNotify=false
  Terminal=false
 --- gnome-screensaver-2.18.0/savers/slideshow.c.user-dirs	2007-02-22 23:39:09.000000000 -0500
-+++ gnome-screensaver-2.18.0/savers/slideshow.c	2007-03-30 22:13:17.000000000 -0400
++++ gnome-screensaver-2.18.0/savers/slideshow.c	2007-04-01 09:17:56.000000000 -0400
 @@ -34,6 +34,8 @@
  #include "gs-theme-engine.h"
  #include "gste-slideshow.h"
@@ -20,19 +20,24 @@
  int
  main (int argc, char **argv)
  {
-@@ -79,6 +81,11 @@
+@@ -79,6 +81,16 @@
                            G_CALLBACK (gtk_main_quit), NULL);
  
          engine = g_object_new (GSTE_TYPE_SLIDESHOW, NULL);
 +
 +	if (location == NULL) {
 +		location = xdg_user_dir_lookup ("PICTURES");
++		if (strcmp (location, "/tmp") == 0 || 
++                    strcmp (location, g_get_home_dir ()) == 0) {
++			free (location);
++			location = g_build_filename (g_get_home_dir (), "Pictures", NULL); 
++		}
 +	}
 +
          if (location != NULL) {
                  g_object_set (engine, "images-location", location, NULL);
          }
---- /dev/null	2007-03-30 22:25:08.845418234 -0400
+--- /dev/null	2007-04-01 08:32:00.119333847 -0400
 +++ gnome-screensaver-2.18.0/savers/xdg-user-dir-lookup.c	2007-03-30 22:13:17.000000000 -0400
 @@ -0,0 +1,167 @@
 +/*
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index 23b96b3..88e91b2 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -126,6 +126,9 @@ fi
 %{_sysconfdir}/skel/Pictures
 
 %changelog
+* Sun Apr  1 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-3
+- Fall back to HOME/Pictures if PICTURES is not set
+
 * Fri Mar 30 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-2
 - Use the PICTURES user dir in the Pictures screensaver