diff --git a/flac.spec b/flac.spec
index 5d471ee..24f0751 100644
--- a/flac.spec
+++ b/flac.spec
@@ -3,15 +3,16 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
 Version: 1.1.0
-Release: 3
+Release: 4
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
-Patch: flac-1.1.0-m4.patch
+Patch0: flac-1.1.0-m4.patch
 Patch1: flac-1.1.0-libtool.patch
 URL: http://flac.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: xmms-devel, libogg-devel, doxygen
+Obsoletes: flac-libs
 
 %description
 FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
@@ -30,13 +31,17 @@ Requires: %{name} = %{version}
 This package contains all the files needed to develop applications that
 will use the Free Lossless Audio Codec.
 
-%package xmms
-Summary: X MultiMedia System plugin to play FLAC files.
+%package -n xmms-%{name}
+Summary: XMMS input plugin needed to play FLAC (Free Lossless Audio Codec) files.
 Group: Applications/Multimedia
-Requires: xmms >= 0.9.5.1, %{name} = %{version}
+Requires: xmms >= 1:1.2.7
+Obsoletes: flac-xmms
 
-%description xmms
-An input plugin that enables playback of FLAC files in xmms.
+%description -n xmms-%{name}
+FLAC is a Free Lossless Audio Codec. The FLAC format supports
+streaming, seeking, and archival, and gives 25-75% compression on
+typical CD audio.
+This is the input plugin for XMMS to be able to FLAC files.
 
 %prep
 %setup -q
@@ -46,7 +51,6 @@ An input plugin that enables playback of FLAC files in xmms.
 %build
 %configure
 make %{?_smp_mflags}
-#make check
 
 %install
 rm -rf %{buildroot}
@@ -63,7 +67,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS COPYING* README
 %{_bindir}/flac
 %{_bindir}/metaflac
@@ -79,12 +83,16 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_datadir}/aclocal/*.m4
 
-%files xmms
-%defattr(-, root, root)
+%files -n xmms-%{name}
+%defattr(-, root, root,-)
 %exclude %{xmmsinputdir}/*.la
 %{xmmsinputdir}/*.so
 
 %changelog
+* Sun Apr 04 2004 Warren Togami <wtogami@redhat.com> 1.1.0-4
+- #119551 flac-xmms -> xmms-flac to match fedora.us and freshrpms.net
+- Obsoletes flac-libs to upgrade smoothly from fedora.us
+
 * Thu Mar 11 2004 Bill Nottingham <notting@redhat.com> 1.1.0-3
 - fix x86_64 linkage (#117893)