diff --git a/.gitignore b/.gitignore
index e18b786..7a4b129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-faad2-2.6.1.tar.gz
+faad2-2.7.tar.bz2
diff --git a/faad2-cve-2008-4201.patch b/faad2-cve-2008-4201.patch
deleted file mode 100644
index ba5409d..0000000
--- a/faad2-cve-2008-4201.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up faad2/frontend/main.c.cve faad2/frontend/main.c
---- faad2/frontend/main.c.cve	2007-11-01 13:33:29.000000000 +0100
-+++ faad2/frontend/main.c	2008-11-10 22:43:49.000000000 +0100
-@@ -914,6 +914,8 @@ int decodeMP4file(char *mp4file, char *s
-                 sample_count = frameInfo.samples;
-             } else {
-                 sample_count = (unsigned int)(dur * frameInfo.channels);
-+                if (sample_count > frameInfo.samples)
-+                    sample_count = frameInfo.samples;
- 
-                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
-                 {
diff --git a/faad2-pic.patch b/faad2-pic.patch
new file mode 100644
index 0000000..c382b64
--- /dev/null
+++ b/faad2-pic.patch
@@ -0,0 +1,12 @@
+diff -up faad2-2.7/common/mp4ff/Makefile.in.pic faad2-2.7/common/mp4ff/Makefile.in
+--- faad2-2.7/common/mp4ff/Makefile.in.pic	2009-02-10 09:36:11.000000000 +0100
++++ faad2-2.7/common/mp4ff/Makefile.in	2009-03-14 12:38:40.000000000 +0100
+@@ -93,7 +94,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DPIC -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
diff --git a/faad2.spec b/faad2.spec
index e6982f5..719ed2b 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -11,18 +11,18 @@
 Summary:	Library and frontend for decoding MPEG2/4 AAC
 Name:		faad2
 Epoch:		1
-Version:	2.6.1
-Release:	6%{?dist}
+Version:	2.7
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.audiocoding.com/faad2.html
-Source:		http://download.sourceforge.net/faac/%{name}-%{version}.tar.gz
-Patch0:		%{name}-cve-2008-4201.patch
+Source:		http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2
+# fix non-PIC objects in libmp4ff.a
+Patch0:		%{name}-pic.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	gcc-c++
 BuildRequires:	id3lib-devel
 %{!?_without_sysfs:BuildRequires: libsysfs-devel}
-BuildRequires:	libtool
 BuildRequires:	xmms-devel
 BuildRequires:	zlib-devel
 
@@ -55,7 +55,7 @@ This package contains development files and documentation for libfaad.
 %package -n xmms-%{name}
 Summary:	AAC XMMS Input Plugin
 Group:		Applications/Multimedia
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Provides:	xmms-aac = %{version}-%{release}
 Obsoletes:	xmms-aac < 2.6.1
 
@@ -66,8 +66,8 @@ written from scratch.
 This package contains an input plugin for xmms.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .cve
+%setup -q
+%patch0 -p1 -b .pic
 find . -name "*.c" -o -name "*.h" | xargs chmod 644
 
 for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
@@ -75,13 +75,15 @@ for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
 done
 
 %build
-# This is what the README.linux file recommends
-autoreconf -vif
 %configure \
     --disable-static \
     --with-xmms \
 #    --with-drm
 
+# remove rpath from libtool
+sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %{__make} %{?_smp_mflags}
 
 %install
@@ -89,6 +91,10 @@ autoreconf -vif
 %{__make} install DESTDIR=%{buildroot}
 %{__rm} %{buildroot}%{_libdir}/libfaad.la
 %{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la
+%{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h
+%{__rm} %{buildroot}%{_libdir}/libmp4ff.a
+install -dm755 %{buildroot}%{_mandir}/man1
+%{__mv} %{buildroot}%{_mandir}/{manm/faad.man,man1/faad.1}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -99,8 +105,9 @@ autoreconf -vif
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog NEWS README* TODO
+%doc AUTHORS COPYING ChangeLog NEWS README*
 %{_bindir}/faad
+%{_mandir}/man1/faad.1*
 
 %files libs
 %defattr(-,root,root,-)
@@ -108,6 +115,7 @@ autoreconf -vif
 
 %files devel
 %defattr(-, root, root, -)
+%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf
 %{_includedir}/faad.h
 %{_includedir}/neaacdec.h
 %{_libdir}/libfaad.so
@@ -119,6 +127,14 @@ autoreconf -vif
 %{xmmsinputplugindir}/libmp4.so
 
 %changelog
+* Fri Mar 13 2009 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.7-1
+- update to 2.7
+- don't install internal libmp4ff
+- include manpage
+- fix build on x86_64 (non-PIC objects in libmp4ff.a)
+- fix rpaths
+- make xmms plugin depend on -libs, not the frontend
+
 * Mon Nov 10 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-6
 - fix CVE-2008-4201
 
diff --git a/sources b/sources
index 6921b84..a86e592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74e92df40c270f216a8305fc87603c8a  faad2-2.6.1.tar.gz
+4c332fa23febc0e4648064685a3d4332  faad2-2.7.tar.bz2