diff --git a/.gitignore b/.gitignore
index 2818779..d8e2a3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libffado-2.0.1-svn1864.tar.bz2
 /libffado-2.1.0-svn1913.tar.bz2
 /libffado-2.1.0-svn1983.tar.bz2
+/libffado-2.1.0-svn2000.tar.bz2
diff --git a/libffado-add-link-flags b/libffado-add-link-flags
deleted file mode 100644
index 0ce8752..0000000
--- a/libffado-add-link-flags
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -PNur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
---- libffado-2.1.0.orig/SConstruct	2011-04-21 21:32:11.000000000 +1000
-+++ libffado-2.1.0/SConstruct	2011-04-25 23:42:12.000000000 +1000
-@@ -75,7 +75,7 @@
-     BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ),
-     BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ),
-     ( "COMPILE_FLAGS", "Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their built.\n Using this is not supported by the ffado-devs!" ),
--
-+    ( "LINKFLAGS", "Add additional flags to the linker command line.","")
-     )
- 
- ## Load the builders in config
-diff -PNur libffado-2.1.0.orig/src/SConscript libffado-2.1.0/src/SConscript
---- libffado-2.1.0.orig/src/SConscript	2010-09-11 07:50:58.000000000 +1000
-+++ libffado-2.1.0/src/SConscript	2011-04-26 13:01:32.000000000 +1000
-@@ -280,6 +280,10 @@
- 	if env['REQUIRE_LIBAVC']:
- 		libenv.MergeFlags( env['LIBAVC1394_FLAGS'] )
- 
-+# Add additional linker flags
-+if env['LINKFLAGS']:
-+    libenv.MergeFlags( env['LINKFLAGS'] )
-+
- libname_versioned = "libffado.so.%s" % libenv['VERSION']
- libname_versioned_short = "libffado.so.%s" % libenv['VERSION'].split('.')[0]
- 
diff --git a/libffado.spec b/libffado.spec
index 5df4729..ab735b1 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -5,15 +5,15 @@
 Summary:        Free firewire audio driver library
 Name:           libffado
 Version:        2.1.0
-Release:        0.3.20110426.svn1983%{?dist}
+Release:        0.4.20111030.svn2000%{?dist}
 # src/libutil/float_cast.h is LGPLv2+.
 # The rest is (GPLv2 or GPLv3)
 License:        LGPLv2+ and (GPLv2 or GPLv3)
 Group:          System Environment/Libraries
 URL:            http://www.ffado.org/
 # The trunk is tarballed as follows:
-# bash libffado-snapshot.sh 1983
-Source0:        %{name}-%{version}-svn1983.tar.bz2
+# bash libffado-snapshot.sh 2000
+Source0:        %{name}-%{version}-svn2000.tar.bz2
 # Additional README file until we have proper manpages
 Source1:        README.ffado
 # The fetch script
@@ -21,8 +21,6 @@ Source9:        libffado-snapshot.sh
 # We want the documentation for the library API only, not for the entire source:
 # http://subversion.ffado.org/ticket/293
 Patch0:         libffado-api-doc-only.patch
-# Patch scons to receive additional LINK flags
-Patch1:         libffado-add-link-flags
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
@@ -77,23 +75,16 @@ Applications and utilities for use with libffado.
 %prep
 %setup -q
 %patch0 -p1 -b .api.doc.only
-%patch1 -p1
 
 cp -a %{SOURCE1} .
 
 %build
-# use gold linker
-ln -s /usr/bin/ld.gold ld
-
 scons %{?_smp_mflags} \
       COMPILE_FLAGS="%{optflags} -ffast-math" \
       PREFIX=%{_prefix} \
       LIBDIR=%{_libdir} \
-      BUILD_TESTS=0 \
-      LINKFLAGS="-B%{_builddir}/%{name}-%{version}"
+      BUILD_TESTS=0
 
-# remove ld.gold symlink
-rm ld
 
 %install
 rm -rf %{buildroot}
@@ -154,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/ffado/
 
 %changelog
+* Sun Oct 30 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.1.0-0.4.20111030.svn2000
+- Update to svn2000.
+- Drop the gold linker patch. The issue is properly solved upstream. See upstream tracker #293
+
 * Mon Apr 26 2011 Brendan Jones <brendan.jones.it@gmail.com> - 2.1.0-0.3.20110426.svn1983
 - Update to svn1983
 - Clean up redundant patches
diff --git a/sources b/sources
index 6766682..cacc7ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80fed375751ce6016ffee345ceec193a  libffado-2.1.0-svn1983.tar.bz2
+029234b5146bfebd9fa7cb18bef57e2d  libffado-2.1.0-svn2000.tar.bz2