diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..8e3d1f7
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,2 @@
+libdbus-c++-1-0
+libdbus-c++-glib-1-0
diff --git a/libdbus-c++-nodocdatetime.patch b/libdbus-c++-nodocdatetime.patch
new file mode 100644
index 0000000..c2be13d
--- /dev/null
+++ b/libdbus-c++-nodocdatetime.patch
@@ -0,0 +1,12 @@
+Index: doc/foot.html
+===================================================================
+--- doc/foot.html.orig	2011-11-30 18:57:37.000000000 +0200
++++ doc/foot.html	2012-03-13 14:44:14.494516524 +0200
+@@ -10,7 +10,6 @@
+     <table><tr>
+       <td></td>
+       <td class="copyright">Copyright &copy;$year DBus-C++ Project</td>
+-      <td class="generated">Docs generated $datetime</td>
+     </tr></table>
+   </div>
+ 
diff --git a/libdbus-c++.changes b/libdbus-c++.changes
index fc138ef..e3d3f62 100644
--- a/libdbus-c++.changes
+++ b/libdbus-c++.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 12 08:42:55 UTC 2012 - davejplater@gmail.com
+
+- Added baselibs.conf for 32 bit compat libs.
+
 -------------------------------------------------------------------
 Sun Mar 11 11:53:09 UTC 2012 - davejplater@gmail.com
 
diff --git a/libdbus-c++.spec b/libdbus-c++.spec
index 81c47a9..25f4aa5 100644
--- a/libdbus-c++.spec
+++ b/libdbus-c++.spec
@@ -20,19 +20,31 @@
 Name:           libdbus-c++
 Version:        0.9.0
 Release:        1
+License:        LGPL-2.1+
 Summary:        C++ Interface for DBus
 Url:            http://dbus-cplusplus.sourceforge.net/index.html
-License:        LGPL-2.1+
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.bz2
+Source1:        baselibs.conf
 # Fix no return from function
 Patch0:         libdbus-c++-noreturn.patch
-# Get ffado to build
+# Get ffado to build with libdbus-c++
 Patch1:         libdbus-c++-pthread.patch
-BuildRequires:  dbus-1-devel gcc-c++ pkgconfig
-BuildRequires:  autoconf automake libtool
-BuildRequires:  dbus-1-glib-devel libexpat-devel
-BuildRequires:  dos2unix doxygen gtkmm2-devel
+# No current date / time allowed in docs?
+Patch2:         libdbus-c++-nodocdatetime.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  dos2unix
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  graphviz
+BuildRequires:  gtkmm2-devel
+BuildRequires:  libexpat-devel
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
 # ecore
 %if 0%{?suse_version} >= 1030
 BuildRequires:  libexpat-devel
@@ -46,32 +58,29 @@ DBus-c++ attempts to provide a C++ API for D-BUS. The library has
 a glib and an ecore mainloop integration. It also offers an
 optional own main loop.
 
-
 %package -n libdbus-c++-1-0
-Group:          System/Libraries
 Summary:        The libdbus-c++ library
+Group:          System/Libraries
 
 %description -n libdbus-c++-1-0
 DBus-c++ attempts to provide a C++ API for D-BUS. The library has
 a glib and an ecore mainloop integration. It also offers an
 optional own main loop. The libdbus-c++ library.
 
-
 %package -n libdbus-c++-glib-1-0
-Group:          System/Libraries
 Summary:        Glib for libdbus-c++
+Group:          System/Libraries
 
 %description -n libdbus-c++-glib-1-0
 DBus-c++ attempts to provide a C++ API for D-BUS. The library has
 a glib and an ecore mainloop integration. It also offers an
-optional own main loop. The glib libdbus-c++ library. 
-
+optional own main loop. The glib libdbus-c++ library.
 
 %package devel
-Group:          Development/Libraries/C and C++
 Summary:        Development files for libdbus-c++
-Requires:       libdbus-c++-glib-1-0 = %{version}
+Group:          Development/Libraries/C and C++
 Requires:       libdbus-c++-1-0 = %{version}
+Requires:       libdbus-c++-glib-1-0 = %{version}
 
 %description devel
 DBus-c++ attempts to provide a C++ API for D-BUS. The library has
@@ -83,6 +92,7 @@ optional own main loop. Files for building against libdbus-c++
 %setup -q
 %patch0
 %patch1
+%patch2
 
 %build
 #./autogen.sh
@@ -92,13 +102,15 @@ export LDFLAGS="$LDFLAGS -lexpat"
 %else
 export LDFLAGS="$LDFLAGS -lexpat -lpthread"
 %endif
-# FIXME: The documentation doesn't build do a manual build if need be.
+
 %configure --disable-ecore --enable-doxygen-docs --enable-static=no
 make %{?_smp_flags}
 
 %install
-%makeinstall
+%make_install
 dos2unix -k AUTHORS
+rm -f %{buildroot}%{_libdir}/*.la
+%fdupes -s doc/
 
 %post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig
 
@@ -118,16 +130,16 @@ dos2unix -k AUTHORS
 %{_libdir}/libdbus-c++-glib-1.so.0
 %{_libdir}/libdbus-c++-glib-1.so.0.0.0
 
-# TODO: Separate the two lib's devel packages. There's only one set of headers.
+# TODO: Separate the two lib's devel packages. There's only one set of headers though.
+# FIXME: Every html file contains date and time, must be fixed before docs are included.
+# FIXME: Add this to %%doc when fixed "doc/html doc/img" maybe a separate doc package.
 
 %files devel
 %defattr(-,root,root)
-%doc AUTHORS COPYING README TODO
+%doc AUTHORS COPYING README TODO doc/html doc/img
 %{_bindir}/dbusxx-xml2cpp
 %{_bindir}/dbusxx-introspect
 %{_libdir}/libdbus-c++-1.so
-%{_libdir}/libdbus-c++-1.la
-%{_libdir}/libdbus-c++-glib-1.la
 %{_libdir}/libdbus-c++-glib-1.so
 %{_includedir}/dbus-c++-1
 %{_libdir}/pkgconfig/*.pc