diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 689a3ec..11a194a 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -3,8 +3,8 @@
 
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
-Version: 0.16
-Release: 3%{?dist}
+Version: 0.18
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
 License: GPLv2+
@@ -12,9 +12,6 @@ Group: Development/Tools
 
 BuildRequires: glib2-devel
 
-# https://bugs.freedesktop.org/show_bug.cgi?id=31413
-Patch0: scheme-handler.patch
-
 %description
 .desktop files are used to describe an application for inclusion in
 GNOME or KDE menus.  This package contains desktop-file-validate which
@@ -31,7 +28,7 @@ BuildRequires:  emacs
 Requires:       emacs(bin) >= %{_emacs_version}
 
 %description -n emacs-%{pkg}
-%{pkgname} is an add-on package for GNU Emacs. 
+%{pkgname} is an add-on package for GNU Emacs.
 
 %package -n     emacs-%{pkg}-el
 Summary:        Elisp source files for %{pkgname} under GNU Emacs
@@ -40,14 +37,13 @@ BuildArch:      noarch
 Requires:       emacs-%{pkg} = %{version}-%{release}
 
 %description -n emacs-%{pkg}-el
-This package contains the elisp source files for %{pkgname} under 
-GNU Emacs. You do not need to install this package to run %{pkgname}. 
+This package contains the elisp source files for %{pkgname} under
+GNU Emacs. You do not need to install this package to run %{pkgname}.
 Install the %{name} package to use %{pkgname} with GNU Emacs.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .scheme-handler
 
 %build
 %configure
@@ -57,7 +53,7 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
-mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg} 
+mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
 
 %files
 %defattr(-,root,root)
@@ -74,6 +70,9 @@ mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdi
 %{_emacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Thu Jan 13 2011 Matthias Clasen <mclasen@redhat.com> - 0.18-1
+- Update to 0.18
+
 * Fri Nov  5 2010 Matthias Clasen <mclasen@redhat.com> - 0.16-3
 - Don't warn about x-scheme-handler pseudo-mime-types