diff --git a/.cvsignore b/.cvsignore
index 3799a20..8fa6f55 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-vamp-plugin-sdk-1.3.tar.gz
+vamp-plugin-sdk-2.0.tar.gz
diff --git a/sources b/sources
index 007f993..3be1637 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0bc2c066776310631a02cd192735da7  vamp-plugin-sdk-1.3.tar.gz
+6f52328254330389d130a61f8def8afc  vamp-plugin-sdk-2.0.tar.gz
diff --git a/vamp-plugin-sdk-1.3-mk.patch b/vamp-plugin-sdk-1.3-mk.patch
deleted file mode 100644
index 14f6483..0000000
--- a/vamp-plugin-sdk-1.3-mk.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- vamp-plugin-sdk-1.3/Makefile.mk	2008-07-09 06:42:49.000000000 -0400
-+++ vamp-plugin-sdk-1.3/Makefile	2008-07-17 18:21:02.000000000 -0400
-@@ -28,7 +28,7 @@
- 
- # Compile flags
- #
--CXXFLAGS	:= $(CXXFLAGS) -O2 -Wall -I. -fPIC
-+CXXFLAGS	:= $(CXXFLAGS) -I. -fPIC
- 
- # ar, ranlib
- #
-@@ -40,8 +40,8 @@
- # because our plugin exposes only a C API so there are no boundary
- # compatibility problems.)
- #
--#PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
--PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
-+PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a
-+#PLUGIN_LIBS	= $(SDKDIR)/libvamp-sdk.a $(shell g++ -print-file-name=libstdc++.a)
- 
- # File extension for a dynamically loadable object
- #
-@@ -58,10 +58,11 @@
- # have to use "make install".
- #
- INSTALL_PREFIX	 	  := /usr/local
-+LIB                       := /lib
- INSTALL_API_HEADERS	  := $(INSTALL_PREFIX)/include/vamp
- INSTALL_SDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk
- INSTALL_HOSTEXT_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk/hostext
--INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)/lib
-+INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)$(LIB)
- 
- INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.1.1.1
- INSTALL_SDK_LINK_ABI	  := libvamp-sdk.so.1
-@@ -75,7 +76,7 @@
- INSTALL_HOSTSDK_STATIC    := libvamp-hostsdk.a
- INSTALL_HOSTSDK_LA        := libvamp-hostsdk.la
- 
--INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)/lib/pkgconfig
-+INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)$(LIB)/pkgconfig
- 
- # Flags required to tell the compiler to create a dynamically loadable object
- #
diff --git a/vamp-plugin-sdk-2.0-libdir.patch b/vamp-plugin-sdk-2.0-libdir.patch
new file mode 100644
index 0000000..b0e0bd1
--- /dev/null
+++ b/vamp-plugin-sdk-2.0-libdir.patch
@@ -0,0 +1,22 @@
+--- vamp-plugin-sdk-2.0/Makefile.in.libdir	2008-12-01 06:48:41.000000000 -0500
++++ vamp-plugin-sdk-2.0/Makefile.in	2008-12-14 17:04:13.000000000 -0500
+@@ -71,8 +71,8 @@
+ INSTALL_API_HEADERS	  := $(INSTALL_PREFIX)/include/vamp
+ INSTALL_SDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-sdk
+ INSTALL_HOSTSDK_HEADERS	  := $(INSTALL_PREFIX)/include/vamp-hostsdk
+-INSTALL_SDK_LIBS	  := $(INSTALL_PREFIX)/lib
+-INSTALL_PLUGINS		  := $(INSTALL_PREFIX)/lib/vamp
++INSTALL_SDK_LIBS	  := @libdir@
++INSTALL_PLUGINS		  := $(INSTALL_SDK_LIBS)/vamp
+ INSTALL_BINARIES	  := $(INSTALL_PREFIX)/bin 
+ 
+ INSTALL_SDK_LIBNAME	  := libvamp-sdk.so.2.0.0
+@@ -87,7 +87,7 @@
+ INSTALL_HOSTSDK_STATIC    := libvamp-hostsdk.a
+ INSTALL_HOSTSDK_LA        := libvamp-hostsdk.la
+ 
+-INSTALL_PKGCONFIG	  := $(INSTALL_PREFIX)/lib/pkgconfig
++INSTALL_PKGCONFIG	  := $(INSTALL_SDK_LIBS)/pkgconfig
+ 
+ # Flags required to tell the compiler to create a dynamically loadable object
+ #
diff --git a/vamp-plugin-sdk.spec b/vamp-plugin-sdk.spec
index 37bbbd3..91d9c1b 100644
--- a/vamp-plugin-sdk.spec
+++ b/vamp-plugin-sdk.spec
@@ -1,5 +1,5 @@
 Name:           vamp-plugin-sdk
-Version:        1.3
+Version:        2.0
 Release:        1%{?dist}
 Summary:        An API for audio analysis and feature extraction plugins
 
@@ -7,7 +7,7 @@ Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.vamp-plugins.org/
 Source0:        http://downloads.sourceforge.net/vamp/vamp-plugin-sdk-%{version}.tar.gz
-Patch0:         %{name}-1.3-mk.patch
+Patch0:         %{name}-2.0-libdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libsndfile-devel
@@ -39,18 +39,19 @@ developing static applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .mk
+%patch0 -p1 -b .libdir
 
 
 %build
-CXXFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # fix libdir
 find . -name '*.pc.in' -exec sed -i 's|/lib|/%{_lib}|' {} ';'
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL_PREFIX=%{_prefix} LIB=/%{_lib}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -82,10 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/*.so.*
+%{_libdir}/vamp
 
 %files devel
 %defattr(-,root,root,-)
 %doc examples
+%{_bindir}/vamp-*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 14 2008 Michel Salim <salimma@fedoraproject.org> - 2.0-1
+- Update to 2.0
+
 * Thu Jul 17 2008 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.3-1
 - Update to 1.3