diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..87ba5b7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+getid3-2.0.0b5.zip
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 18d7963..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: php-getid3
-# $Id$
-NAME := php-getid3
-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/ampache.patch b/ampache.patch
new file mode 100644
index 0000000..9a19e2a
--- /dev/null
+++ b/ampache.patch
@@ -0,0 +1,38 @@
+diff -Naur getid3/module.audio.mp3.php getid3-ampache/module.audio.mp3.php
+--- getid3/module.audio.mp3.php	2009-06-11 09:25:06.000000000 -0300
++++ getid3-ampache/module.audio.mp3.php	2009-05-05 21:25:04.000000000 -0300
+@@ -1076,6 +1076,8 @@
+         fseek($fd, $avdata_offset, SEEK_SET);
+         
+         $sync_seek_buffer_size = min(128 * 1024, $info['avdataend'] - $avdata_offset);
++	// If sync < 1 then resort to default of 128 * 1024
++	if ($sync_seek_buffer_size < 1) { $sync_seek_buffer_size = 128 * 1024; }
+         $header = fread($fd, $sync_seek_buffer_size);
+         $sync_seek_buffer_size = strlen($header);
+         $synch_seek_offset = 0;
+diff -Naur getid3/module.tag.id3v2.php getid3-ampache/module.tag.id3v2.php
+--- getid3/module.tag.id3v2.php	2009-06-11 09:26:56.000000000 -0300
++++ getid3-ampache/module.tag.id3v2.php	2009-05-05 21:25:04.000000000 -0300
+@@ -3155,6 +3155,7 @@
+             'TPE3' => 'conductor',
+             'TPE4' => 'remixer',
+             'TPUB' => 'publisher',
++	    'TPOS' => 'disk',
+             'TRC'  => 'isrc',
+             'TRCK' => 'track',
+             'TRK'  => 'track',
+diff -Naur getid3/write.id3v2.php getid3-ampache/write.id3v2.php
+--- getid3/write.id3v2.php	2009-06-11 10:12:03.000000000 -0300
++++ getid3-ampache/write.id3v2.php	2009-06-11 10:13:27.000000000 -0300
+@@ -374,9 +374,8 @@
+         }
+ 
+         // rewrite file - no tag present or new tag longer than old tag
+-        else
+-
+-            if (!$fp_source = @fopen($this->filename, 'rb')) {
++        else {
++        	if (!$fp_source = @fopen($this->filename, 'rb')) {
+                 throw new getid3_exception('Could not open '.$this->filename.' mode "rb"');
+             }
+             fseek($fp_source, $engine->info['avdataoffset'], SEEK_SET);
diff --git a/php-getid3.spec b/php-getid3.spec
new file mode 100644
index 0000000..ec61f48
--- /dev/null
+++ b/php-getid3.spec
@@ -0,0 +1,54 @@
+Name:      php-getid3
+Version:   2.0.0b5
+Release:   1%{?dist}
+License:   GPLv2
+Summary:   The PHP media file parser
+Group:     Development/Libraries
+URL:       http://getid3.sourceforge.net/
+Source0:   http://downloads.sourceforge.net/getid3/getid3-%{version}.zip
+Patch0:    ampache.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:  php >= 5.0.0
+BuildArch: noarch
+
+%description
+getID3() is a PHP script that extracts useful information 
+(such as ID3 tags, bitrate, playtime, etc.) from MP3s & 
+other multimedia file formats (Ogg, WMA, WMV, ASF, WAV, AVI, 
+AAC, VQF, FLAC, MusePack, Real, QuickTime, Monkey's Audio, MIDI and more).
+
+%prep
+%setup -q -c
+%patch0 -p0 -b .ampache
+for i in ./*.txt demos/*.php; do
+      iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+      touch -r "$i" "${i}_"
+      mv "${i}_" "$i"
+done
+sed -i 's/\r//' demos/index.php
+sed -i 's/\r//' demos/demo.mysql.structure.sql
+
+%build
+
+%install
+rm -rf %{buildroot}
+
+mkdir -p %{buildroot}%{_datadir}/php
+cp -a getid3 %{buildroot}%{_datadir}/php/
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc *.txt demos
+%{_datadir}/php/getid3
+
+%changelog
+
+* Thu Jun 04 2009 Paulo Roma <roma@lcg.ufrj.br> 2.0.0b5-1
+- Updated to 2.0.0b5
+- Patched with ampache fixes.
+
+* Thu Jun 04 2009 Paulo Roma <roma@lcg.ufrj.br> 1.7.9-1
+- Initial spec file.
diff --git a/sources b/sources
index e69de29..6576cc7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d2b24ccb4bd4a5c135517bd0ae3b2dd3  getid3-2.0.0b5.zip