diff --git a/ladspa-devel.spec b/ladspa-devel.spec
index 754dd7d..3c1a2bf 100644
--- a/ladspa-devel.spec
+++ b/ladspa-devel.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ladspa-devel
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,15 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           ladspa-devel
 Summary:        Include Files mandatory for Development
-Version:        1.13
-Release:        6
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
+Version:        1.13
+Release:        0
 Source:         ladspa_sdk_1.13.tar.bz2
 Url:            http://www.ladspa.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -33,12 +31,6 @@ Provides:       ladspa-devel > 1.12.code10.3.1
 %description
 This package contains include files to develop LADSPA plugins.
 
-
-
-Authors:
---------
-    Richard Furse <richard@muse.demon.co.uk>
-
 %prep
 %setup -n ladspa_sdk
 
diff --git a/ladspa.changes b/ladspa.changes
index 889cae3..c8a9ea3 100644
--- a/ladspa.changes
+++ b/ladspa.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 14 07:51:10 UTC 2012 - coolo@suse.com
+
+- remove old %suse_update_config
+
+-------------------------------------------------------------------
+Thu Feb  9 14:20:40 UTC 2012 - reddwarf@opensuse.org
+
+- Remove swh-configure-2.65.patch for >12.1
+
 -------------------------------------------------------------------
 Sun Nov 13 09:12:07 UTC 2011 - coolo@suse.com
 
diff --git a/ladspa.spec b/ladspa.spec
index 480251f..fa1028c 100644
--- a/ladspa.spec
+++ b/ladspa.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ladspa
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,12 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           ladspa
-BuildRequires:  fdupes fftw3-devel flac-devel gcc-c++ ladspa-devel libsndfile-devel pkgconfig xorg-x11-util-devel
+BuildRequires:  fdupes
+BuildRequires:  fftw3-devel
+BuildRequires:  flac-devel
+BuildRequires:  gcc-c++
+BuildRequires:  ladspa-devel
+BuildRequires:  libsndfile-devel
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  xorg-x11-util-devel
 %define AMB_version 0.6.1
 %define FIL_version 0.3.0
 %define MCP_version 0.4.0
@@ -38,10 +43,10 @@ BuildRequires:  libtool
 %define vlevel_version 0.5
 %define vocoder_version 0.3
 Summary:        The Linux Audio Developer's Simple Plug-In API
-Version:        1.13
-Release:        9
 License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Sound/Utilities
+Version:        1.13
+Release:        0
 AutoReq:        on
 Autoprov:       off
 Provides:       ladspa > 1.12.code10.3.1
@@ -120,14 +125,6 @@ ability to write simple plug-in audio processors in C/C++ and link them
 dynamically.  The package contains the LADSPA SDK, the CMT plug-in
 libraries (including Freeverb), and the swh plug-ins.
 
-
-
-Authors:
---------
-    Richard Furse <richard@muse.demon.co.uk>
-    Jezar at Dreampoint <dreampoint.co.uk>
-    Steve Harris <steve@plugin.org.uk>
-
 %prep
 #
 # More URLs
@@ -154,8 +151,9 @@ Authors:
 %patch20 -p1
 touch config.rpath
 ./autogen.sh --prefix=%{_prefix}
-%{?suse_update_config:%{suse_update_config -f}}
+%if 0%{?suse_version} <= 1210
 %patch21 -p 1
+%endif
 )
 (cd cmt
 %patch2
@@ -172,7 +170,6 @@ touch config.rpath
 %patch6
 %patch27
 %patch28
-%{?suse_update_config:%{suse_update_config -f}}
 )
 (cd vcf-%{vcf_version}
 %patch7
@@ -209,98 +206,99 @@ touch config.rpath
 export SUSE_ASNEEDED=0
 # LADSPA SDK
 cd ladspa_sdk/src
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" targets
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" targets
 cd ../..
 # CMT
 cd cmt/src
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -ggdb" targets
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -ggdb" targets
 cd ../..
 # SWH plugins
 cd swh-plugins-%{swh_version}
+autoreconf --install --force
 #./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir}
 CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing" \
 ./configure --prefix=%{_prefix}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing"
 cd ..
 # Vocoder
 cd vocoder-%{vocoder_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # Alien Wah
 cd alienwah-%{alienwah_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # Sooperlooper
 cd sooperlooper-%{sooperlooper_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # Blop
 cd blop-%{blop_version}
 autoreconf --install --force
 ./configure --prefix=%{_prefix} \
 	    --with-ladspa-plugin-dir=%{_libdir}/ladspa
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DPIC -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DPIC -fPIC -ggdb"
 cd ..
 # VCF
 cd vcf-%{vcf_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # unmatched
 cd unmatched
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # matched
 cd matched
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # preamp
 cd preamp
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -fno-strict-aliasing" \
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -fno-strict-aliasing" \
      CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -fno-strict-aliasing"
 cd ..
 # MCP plugins
 cd MCP-plugins-%{MCP_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # REV plugins
 cd REV-plugins-%{REV_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # VCO plugins
 cd VCO-plugins-%{VCO_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # vlevel
 cd vlevel-%{vlevel_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb"
 cd ..
 # tap-plugins
 cd tap-plugins-%{tap_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -c"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -c"
 cd ..
 # super-60
 cd super-60
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 # caps
 cd caps-%{caps_version}
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 # FIL plugins
 cd FIL-plugins-%{FIL_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 # AMB plugins
 cd AMB-plugins-%{AMB_version}
-make %{?jobs:-j%jobs} CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 # pvoc plugins
 cd pvoc-%{pvoc_version}
-make %{?jobs:-j%jobs} OPTS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} OPTS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 # blepvco
 cd blepvco-%{blepvco_version}
-make %{?jobs:-j%jobs} CPPFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
+make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC"
 cd ..
 
 %install