diff --git a/libdbus-c++.spec b/libdbus-c++.spec
index 6270ae3..fae74bc 100644
--- a/libdbus-c++.spec
+++ b/libdbus-c++.spec
@@ -15,66 +15,68 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           libdbus-c++
 Version:        0.9.0
 Release:        1
 Summary:        C++ Interface for DBus
-URL:            http://dbus-cplusplus.sourceforge.net/index.html
+Url:            http://dbus-cplusplus.sourceforge.net/index.html
 License:        LGPL-2.0
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.bz2
 # Fix no return from function
 Patch0:         libdbus-c++-noreturn.patch
-# Attempt to fix ffado build
+# Get ffado to build
 Patch1:         libdbus-c++-pthread.patch
-BuildRequires:  pkgconfig gcc-c++ dbus-1-devel
+BuildRequires:  dbus-1-devel gcc-c++ pkgconfig
 BuildRequires:  autoconf automake libtool
 BuildRequires:  dbus-1-glib-devel libexpat-devel
-BuildRequires:  gtkmm2-devel dos2unix doxygen
+BuildRequires:  dos2unix doxygen gtkmm2-devel
 # ecore
 %if 0%{?suse_version} >= 1030
 BuildRequires:  libexpat-devel
 %else
-BuildRequires:   expat
+BuildRequires:  expat
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-
 %description
-Ability to reflect dbus methods and signals into a more natural
-C++ object system.
+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:        Libdbus-c++ library
-
+Summary:        The libdbus-c++ library
 
 %description -n libdbus-c++-1-0
-Ability to reflect dbus methods and signals into a more natural
-C++ object system. The libdbus-c++ library.
+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++
 
-
 %description -n libdbus-c++-glib-1-0
-Ability to reflect dbus methods and signals into a more natural
-C++ object system. The glib libdbus-c++ library. 
+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. 
 
 
 %package devel
+Group:          Development/Libraries/C and C++
+Summary:        Development files for libdbus-c++
 Requires:       libdbus-c++-glib-1-0 = %{version}
 Requires:       libdbus-c++-1-0 = %{version}
-Group:          Development/Libraries/C and C++
-Summary:        Header files for libdbus-c++
-
 
 %description devel
-Ability to reflect dbus methods and signals into a more natural
-C++ object system. Files for building against libdbus-c++
+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. Files for building against libdbus-c++
 
 %prep
 
@@ -84,20 +86,20 @@ C++ object system. Files for building against libdbus-c++
 
 %build
 #./autogen.sh
+# FIXME: for some strange reason the 32 bit build needs -lpthread.
 %ifarch x86_64
 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
 dos2unix -k AUTHORS
 
-
 %post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig
 
 %postun -n libdbus-c++-glib-1-0 -p /sbin/ldconfig
@@ -116,6 +118,8 @@ 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.
+
 %files devel
 %defattr(-,root,root)
 %doc AUTHORS COPYING README TODO