diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..3ab8aa2
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libyajl1
diff --git a/libyajl.changes b/libyajl.changes
index 0d94fde..8d26b79 100644
--- a/libyajl.changes
+++ b/libyajl.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Apr  8 20:43:36 UTC 2011 - coolo@novell.com
+
+- add baselibs.conf for 32bit library support
+
+-------------------------------------------------------------------
+Wed Feb  9 19:03:53 UTC 2011 - pascal.bleser@opensuse.org
+
+- revert last change, it is BSD3c indeed, and totally unrelated to
+  bnc#670525
+
+-------------------------------------------------------------------
+Wed Feb  9 18:57:38 UTC 2011 - pascal.bleser@opensuse.org
+
+- fix license, changed from erroneous BSD3c to MIT, as stated on
+  http://pyyaml.org/wiki/LibYAML, sort of fixes bnc#670525
+
 -------------------------------------------------------------------
 Tue Dec 21 23:02:41 UTC 2010 - pascal.bleser@opensuse.org
 
diff --git a/libyajl.spec b/libyajl.spec
index dc30fe8..5c79bad 100644
--- a/libyajl.spec
+++ b/libyajl.spec
@@ -1,60 +1,42 @@
-#
-# spec file for package libyajl
-#
-# Copyright (c) 2011 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
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
+# vim: set sw=4 ts=4 et nu:
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-
-Name:           libyajl
-Version:        1.0.11
-Release:        1
+Name:               libyajl
+Version:            1.0.11
 %define soname 1
 %define tag f4baae0
-Summary:        Yet Another JSON Library 
+Release:            0
+Summary:            Yet Another JSON Library 
 # http://download.github.com/lloyd-yajl-%{version}-0-g%{tag}.tar.gz
-Source:         lloyd-yajl-%{version}-0-g%{tag}.tar.bz2
-Patch1:         libyajl-optflags.patch
-Patch2:         libyajl-lib_suffix.patch
-Source99:       %{name}-rpmlintrc
-Url:            http://lloyd.github.com/yajl/
-Group:          System/Libraries
-License:        BSD3c
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison flex
-BuildRequires:  cmake
-BuildRequires:  gcc-c++ libstdc++-devel
-BuildRequires:  glibc-devel make
+Source:             lloyd-yajl-%{version}-0-g%{tag}.tar.bz2
+Source1:            baselibs.conf
+Patch1:             libyajl-optflags.patch
+Patch2:             libyajl-lib_suffix.patch
+Source99:           %{name}-rpmlintrc
+URL:                http://lloyd.github.com/yajl/
+Group:              System/Libraries
+License:            BSD3c
+BuildRoot:          %{_tmppath}/build-%{name}-%{version}
+BuildRequires:      bison flex
+BuildRequires:      cmake
+BuildRequires:      gcc-c++ libstdc++-devel
+BuildRequires:      make glibc-devel
 
 %description
 YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
 small validating JSON generator.
 
 %package -n %{name}%{soname}
-
-Summary:        Yet Another JSON Library 
-Group:          System/Libraries
+Summary:            Yet Another JSON Library 
+Group:              System/Libraries
 
 %description -n %{name}%{soname}
 YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
 small validating JSON generator.
 
 %package -n %{name}-devel
-
-Summary:        Yet Another JSON Library (Development Environment)
-Group:          Development/Libraries/C and C++
-Requires:       %{name}%{soname} = %{version}
+Summary:            Yet Another JSON Library (Development Environment)
+Group:              Development/Libraries/C and C++
+Requires:           %{name}%{soname} = %{version}
 
 %description -n %{name}-devel
 YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
@@ -64,10 +46,9 @@ This package provides the necessary environment for compiling and linking
 against %{name}.
 
 %package -n %{name}-devel-static
-
-Summary:        Yet Another JSON Library (Static Library)
-Group:          Development/Libraries/C and C++
-Requires:       %{name}-devel = %{version}
+Summary:            Yet Another JSON Library (Static Library)
+Group:              Development/Libraries/C and C++
+Requires:           %{name}-devel = %{version}
 
 %description -n %{name}-devel-static
 YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
@@ -77,10 +58,9 @@ This package provides the necessary environment for linking statically
 against %{name}.
 
 %package -n yajl
-License:        BSD3c
-Summary:        Yet Another JSON Library Tools
-Group:          Productivity/Text/Utilities
-Requires:       %{name}%{soname} = %{version}
+Summary:            Yet Another JSON Library Tools
+Group:              Productivity/Text/Utilities
+Requires:           %{name}%{soname} = %{version}
 
 %description -n yajl
 YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a
@@ -122,7 +102,6 @@ popd build
 %__make test
 
 %post   -n %{name}%{soname} -p /sbin/ldconfig
-
 %postun -n %{name}%{soname} -p /sbin/ldconfig
 
 %clean
@@ -147,4 +126,4 @@ popd build
 %defattr(-,root,root)
 %{_bindir}/json_reformat
 %{_bindir}/json_verify
-%changelog
+