diff --git a/SuSEconfig.gtk2 b/SuSEconfig.gtk2
index f27518b..d30368b 100644
--- a/SuSEconfig.gtk2
+++ b/SuSEconfig.gtk2
@@ -59,11 +59,9 @@ if test -f $r/var/cache/gtk-2.0/icon-theme.cache-list ; then
 fi
 # Update icon cache.
 (
-    # Be sure, that environment is set properly.
-    if test -z "$XDG_DATA_DIRS" ; then
-	if test -f $r/etc/profile.d/xdg-enviroment.sh ; then
-	    . $r/etc/profile.d/xdg-enviroment.sh
-	fi
+    # Ensure, that $XDG_DATA_DIRS is set properly. (#71978, #240603)
+    if test "$PROFILEREAD" != true ; then
+	. $r/etc/profile
     fi
     IFS="$IFS:"
     for DIR in ${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} ; do
diff --git a/gtk2.changes b/gtk2.changes
index 1530715..27aa5ab 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 19 12:03:50 CEST 2007 - sbrabec@suse.cz
+
+- Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603).
+
 -------------------------------------------------------------------
 Wed Apr 11 18:52:54 CDT 2007 - maw@suse.de
 
diff --git a/gtk2.spec b/gtk2.spec
index 473405d..1ee1aa1 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -28,7 +28,7 @@ Group:          System/Libraries
 Autoreqprov:    on
 PreReq:         /usr/bin/touch /bin/rm /bin/rmdir
 Version:        2.10.11
-Release:        1
+Release:        2
 Summary:        Library for Creation of Graphical User Interfaces
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
 Source1:        SuSEconfig.gtk2
@@ -347,6 +347,8 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Apr 19 2007 - sbrabec@suse.cz
+- Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603).
 * Wed Apr 11 2007 - maw@suse.de
 - Remove some extraneous comments that were inadvertently left
   in the .spec.