diff --git a/desktop-file-utils-0.18-unity.patch b/desktop-file-utils-0.18-unity.patch
new file mode 100644
index 0000000..23708bc
--- /dev/null
+++ b/desktop-file-utils-0.18-unity.patch
@@ -0,0 +1,23 @@
+From 47322e554cc5388a3e6325f36b7d07a13f124594 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 31 Mar 2011 16:28:44 +0000
+Subject: Add Unity to list of registered environments
+
+See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
+---
+diff --git a/src/validate.c b/src/validate.c
+index 04bc8d0..9c399a3 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -338,7 +338,7 @@ static struct {
+ };
+ 
+ static const char *show_in_registered[] = {
+-  "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
++  "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
+ };
+ 
+ static struct {
+--
+cgit v0.8.3-6-g21f6
+
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 236051a..0f408fc 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -4,10 +4,13 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.18
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
 Source1: desktop-entry-mode-init.el
+# Upstream commit 47322e554cc5388a3e6325f36b7d07a13f124594: add Unity
+# to list of registered environments
+Patch0: desktop-file-utils-0.18-unity.patch
 License: GPLv2+
 Group: Development/Tools
 
@@ -45,6 +48,7 @@ Install the %{name} package to use %{pkgname} with GNU Emacs.
 
 %prep
 %setup -q
+%patch0 -p1 -b .unity
 
 %build
 %configure
@@ -78,6 +82,10 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc
 %{_emacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Mon Jul 04 2011 Adam Williamson <awilliam@redhat.com> - 0.18-4
+- add unity.patch from upstream: add Unity to list of registered
+  environments
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild