diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 91199e8..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-flac-1.1.4.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b6075fe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+flac-1.2.1.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5f86c7c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmms-flac
-# $Id$
-NAME := xmms-flac
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/flac-1.2.1-gcc43.patch b/flac-1.2.1-gcc43.patch
new file mode 100644
index 0000000..7fdbf80
--- /dev/null
+++ b/flac-1.2.1-gcc43.patch
@@ -0,0 +1,11 @@
+diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
+--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
++++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
+@@ -29,6 +29,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <stdlib.h>
+ #include "FLAC++/metadata.h"
+ #include "FLAC++/encoder.h"
diff --git a/sources b/sources
index 75d8744..87f1211 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3958cbd5b6ed8c14966792538e44223b  flac-1.1.4.tar.gz
+153c8b15a54da428d1f0fadc756c22c7  flac-1.2.1.tar.gz
diff --git a/xmms-flac.desktop b/xmms-flac.desktop
new file mode 100644
index 0000000..64b823d
--- /dev/null
+++ b/xmms-flac.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=XMMS
+Exec=xmms -p -e %F
+Icon=xmms
+MimeType=audio/x-flac;audio/flac;
+Categories=AudioVideo;Player;
+Terminal=false
+Type=Application
+NoDisplay=true
diff --git a/xmms-flac.spec b/xmms-flac.spec
index d6eeadf..4f16cc5 100644
--- a/xmms-flac.spec
+++ b/xmms-flac.spec
@@ -2,18 +2,23 @@
 
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
-Version: 1.1.4
-Release: 5%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 # The entire FLAC sources are covered by multiple licenses, but the xmms plugin
 # is only GPLv2+
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
-Source: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source0: http://dl.sf.net/flac/flac-%{version}.tar.gz
+Source1: xmms-flac.desktop
 Patch0: xmms-flac-1.1.4-rpath.patch
+Patch1: flac-1.2.1-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: xmms-devel, libogg-devel, gettext-devel
 BuildRequires: flac-devel
+BuildRequires: desktop-file-utils
 
 %description
 FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming,
@@ -24,6 +29,7 @@ This is the input plugin for XMMS to be able to read FLAC files.
 %prep
 %setup -q -n flac-%{version}
 %patch0 -p1 -b .rpath
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -35,19 +41,37 @@ This is the input plugin for XMMS to be able to read FLAC files.
 %{__rm} -rf %{buildroot}
 %{__install} -D -m 0755 src/plugin_xmms/.libs/libxmms-flac.so \
     %{buildroot}%{xmms_inputdir}/libxmms-flac.so
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+update-desktop-database &> /dev/null || :
+
+%postun
+update-desktop-database &> /dev/null || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.GPL
+%{_datadir}/applications/xmms-flac.desktop
 %{xmms_inputdir}/libxmms-flac.so
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 1.2.1-1
+- Update to 1.2.1.
+
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.4-7
+- Include hidden desktop entry for the mimetype (#508203).
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild