diff --git a/SuSEconfig.desktop-file-utils b/SuSEconfig.desktop-file-utils
index 2034c4a..a96456c 100644
--- a/SuSEconfig.desktop-file-utils
+++ b/SuSEconfig.desktop-file-utils
@@ -3,9 +3,9 @@
 # Copyright (c) 2005 SuSE
 # Author: Stanislav Brabec <sbrabec@suse.cz>
 
-# Ensure, that $XDG_DATA_DIRS is set. (#71978)
-if test -z "$XDG_DATA_DIRS" ; then
-    . /etc/profile.d/xdg-enviroment.sh
+# Ensure, that $XDG_DATA_DIRS is set properly. (#71978, #240603)
+if test "$PROFILEREAD" != true ; then
+    . $r/etc/profile
 fi
 
 /usr/bin/update-desktop-database
diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes
index 4c3d84b..59488a3 100644
--- a/desktop-file-utils.changes
+++ b/desktop-file-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr 19 12:04:11 CEST 2007 - sbrabec@suse.cz
+
+- Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603).
+
 -------------------------------------------------------------------
 Fri Feb 23 14:26:02 CET 2007 - sbrabec@suse.cz
 
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index bbf26e2..f218862 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          Development/Tools/Other
 Autoreqprov:    on
 Version:        0.12
-Release:        1
+Release:        8
 Source:         %{name}-%{version}.tar.bz2
 Source1:        SuSEconfig.desktop-file-utils
 PreReq:         /bin/rm /bin/rmdir
@@ -90,6 +90,8 @@ fi
 %ghost /opt/kde3/share/applications/mimeinfo.cache
 
 %changelog
+* Thu Apr 19 2007 - sbrabec@suse.cz
+- Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603).
 * Fri Feb 23 2007 - sbrabec@suse.cz
 - Updated to version 0.12:
   * improves category validation code to not catch false positives