diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 010b1b4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile for source rpm: desktop-file-utils
-# $Id$
-NAME := desktop-file-utils
-SPECFILE = $(firstword $(wildcard *.spec))
-
-include ../common/Makefile.common
diff --git a/desktop-file-utils-0.12-encoding.patch b/desktop-file-utils-0.12-encoding.patch
new file mode 100644
index 0000000..55e9fd9
--- /dev/null
+++ b/desktop-file-utils-0.12-encoding.patch
@@ -0,0 +1,22 @@
+--- src/validate.c~	2007-11-30 12:30:56.000000000 -0800
++++ src/validate.c	2007-11-30 12:52:01.000000000 -0800
+@@ -453,7 +453,7 @@
+   void (*validate_type) (const char *value, const char *key, const char *locale, const char *filename, GnomeDesktopFile *df);
+   gboolean deprecated;
+ } key_table[] = {
+-  { "Encoding", validate_string },
++  { "Encoding", validate_string, TRUE },
+   { "Version", validate_numeric },
+   { "Name", validate_localestring },
+   { "GenericName", validate_localestring },
+@@ -735,10 +735,6 @@
+ 	  strcmp (val, "Legacy-Mixed") != 0)
+ 	print_fatal (filename, "unknown Encoding type \"%s\", should be one of \"UTF-8\", \"Legacy-Mixed\"\n", val);
+     }
+-  else
+-    {
+-      print_fatal (filename, "required key \"Encoding\" not found\n");
+-    }
+ 
+   if (!gnome_desktop_file_get_raw (df, section,
+ 				   "Name",
diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index d9d8837..104b34b 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@ BuildRequires: emacs
 Obsoletes: desktop-file-validator
 
 Patch0: desktop-file-utils-0.12-make-vendor-optional.patch
+Patch1: %{name}-0.12-encoding.patch
 
 %description
 .desktop files are used to describe an application for inclusion in
@@ -26,6 +27,7 @@ fixing it up in the process.
 %prep
 %setup -q
 %patch0 -p1 -b .make-vendor-optional
+%patch1 -p0 -b .encoding~
 
 %build
 %configure
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Nov 30 2007 Christopher Stone <chris.stone@gmail.com> 0.12-5
+- add enconding patch (bz #406791)
+
 * Thu Mar 08 2007 Florian La Roche <laroche@redhat.com> - 0.12-4
 - remove empty post/preun scripts completely