diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes
index 63fe33b..847addc 100644
--- a/desktop-file-utils.changes
+++ b/desktop-file-utils.changes
@@ -3,6 +3,13 @@ Thu Aug 20 10:52:02 CEST 2009 - beineri@opensuse.org
 
 - remove KDE3 traces (bnc#531122), will add to kdelibs3 package
 
+-------------------------------------------------------------------
+Mon Aug 17 10:57:18 CEST 2009 - vuntz@novell.com
+
+- Remove emacs-nox BuildRequires, and instead pass --with-lispdir
+  to configure to break a build loop.
+- Update description.
+
 -------------------------------------------------------------------
 Mon Mar 10 13:23:58 CET 2008 - sbrabec@suse.cz
 
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 324f212..d79c1e0 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -19,11 +19,11 @@
 
 
 Name:           desktop-file-utils
-BuildRequires:  emacs-nox glib2-devel pkg-config
+BuildRequires:  glib2-devel pkg-config
 License:        GPL v2 or later
 Group:          Development/Tools/Other
 Version:        0.15
-Release:        83
+Release:        84
 Source:         %{name}-%{version}.tar.bz2
 Source1:        SuSEconfig.desktop-file-utils
 Patch:          desktop-file-utils-suse-keys.patch
@@ -34,25 +34,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Utilities for Manipulating Desktop Files
 
 %description
-Desktop-file-utils contains a couple of command line utilities for
-working with desktop entries.
+This packages contains a couple of command line utilities for
+working with desktop files.
 
-Right now the only documentation is "desktop-file-install --help".
-desktop-file-validate takes a single argument, the file to validate.
-
-
-
-Authors:
---------
-    Havoc Pennington <hp@redhat.com>
-    Alex Larsson <alexl@redhat.com>
+More information about desktop files can be found at:
+http://freedesktop.org/wiki/Specifications/desktop-entry-spec
 
 %prep
 %setup
 %patch
 
 %build
-%configure
+%configure \
+        --with-lispdir=%{_datadir}/emacs/site-lisp
 make %{?jobs:-j%jobs}
 
 %install
@@ -79,6 +73,9 @@ fi
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
+# Own directories to not require emacs installed.
+%dir %{_datadir}/emacs
+%dir %{_datadir}/emacs/site-lisp
 %{_datadir}/emacs/site-lisp/*.el*
 %ghost %{_datadir}/applications/mimeinfo.cache
 /sbin/conf.d/SuSEconfig.*