diff --git a/.cvsignore b/.cvsignore
index 6e54441..1a3f071 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libical-0.30.tar.gz
+libical-0.31.tar.gz
diff --git a/libical.spec b/libical.spec
index 32647db..e1b464c 100644
--- a/libical.spec
+++ b/libical.spec
@@ -1,55 +1,54 @@
-Name:			libical
-Version:		0.30
-Release:		3%{?dist}
-Summary:		Reference implementation of the iCalendar data type and serialization format
-Summary(pl):		Implementacja formatu iCalendar
+Name:		libical
+Version:	0.31
+Release:	1%{?dist}
+Summary:	Reference implementation of the iCalendar data type and serialization format
+Summary(pl):	Implementacja formatu iCalendar
 
-Group:			System Environment/Libraries
-License:		MPL, LGPLv2
-URL:			http://freeassociation.sourceforge.net/
-Source0:		http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
+Group:		System Environment/Libraries
+License:	LGPLv2 or MPLv1.1
+URL:		http://freeassociation.sourceforge.net/
+Source0:	http://downloads.sourceforge.net/freeassociation/%{name}-%{version}.tar.gz
 
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#BuildRequires:		
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
-Reference implementation of the 
-iCalendar data type and serialization 
-format. libical is used in dozens of 
-calendaring and scheduling products.
+Reference implementation of the iCalendar data type and serialization format
+used in dozens of calendaring and scheduling products.
 
-%description		-l pl
-Implementacja formatu iCalendar, 
-używana w wielu kalendarzach 
-i planerach/planistach.
+%description -l pl
+Implementacja formatu iCalendar, używana w wielu kalendarzach i
+planerach/planistach.
 
-%package		devel
-Summary:		Development files for libical
-Summary(pl):		Pliki deweloperskie dla libical
-Group:			Development/Libraries
-Requires:		libical = %{version}-%{release}
+%package devel
+Summary:	Development files for libical
+Summary(pl):	Pliki deweloperskie dla libical
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
-%description		devel
-The libical-devel package contains libraries 
-and header files for developing 
+%description devel
+The libical-devel package contains libraries and header files for developing 
 applications that use libical.
 
-%description		devel -l pl
-libical-devel zawiera biblioteki i pliki niezbędne 
-do tworzenia aplikacji korzystających z libical.
+%description devel -l pl
+libical-devel zawiera biblioteki i pliki niezbędne do tworzenia aplikacji
+korzystających z libical.
 
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-reentrant --enable-cxx
+
+# Omit unused direct shared library dependencies.
+sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
+
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,16 +59,46 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS THANKS TODO
-%{_libdir}/*.so.*
+%doc AUTHORS
+%doc ChangeLog
+%doc COPYING
+%doc LICENSE
+%doc NEWS
+%doc README
+%doc THANKS
+%doc TODO
+%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}_cxx.so.*
+%{_libdir}/libicalss.so.*
+%{_libdir}/libicalss_cxx.so.*
+%{_libdir}/libicalvcal.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc examples
-%{_includedir}/
-%{_libdir}/*.so
+%doc doc/UsingLibical.txt
+%{_includedir}/ical.h
+%{_includedir}/ical*.h
+%{_includedir}/icptrholder.h
+%{_includedir}/pvl.h
+%{_includedir}/sspm.h
+%{_includedir}/vcomponent.h
+%{_libdir}/%{name}.so
+%{_libdir}/%{name}_cxx.so
+%{_libdir}/libicalss.so
+%{_libdir}/libicalss_cxx.so
+%{_libdir}/libicalvcal.so
 
 %changelog
+* Thu Jul 17 2008 Jeff Perry <jeffperry_fedora@sourcesink.com> - 0.31-1
+- Version bump to 0.31.
+
+* Thu Jul 17 2008 Debarshi Ray <rishi@fedoraproject.org> - 0.30-4
+- Changed value of License according to Fedora licensing guidelines.
+- Enabled reentrant system calls and C++ bindings.
+- Omitted unused direct shared library dependencies.
+- Added ChangeLog, COPYING, LICENSE, NEWS and README to doc and dropped
+  examples.
+
 * Wed Apr 02 2008 Jakub 'Livio' Rusinek <jakub.rusinek@gmail.com> - 0.30-3
 - Source URL... Fixed
 
diff --git a/sources b/sources
index 242324a..af91024 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4932ac39dd06fbfee42d7b82d10ab615  libical-0.30.tar.gz
+39382c919abd9abfab6ecba27715eaa5  libical-0.31.tar.gz