diff --git a/postgresql-odbc.spec b/postgresql-odbc.spec
index c8f03e8..4625443 100644
--- a/postgresql-odbc.spec
+++ b/postgresql-odbc.spec
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
 Version: 08.01.0200
-Release: 1.2
+Release: 2
 License: LGPL
 Group: Applications/Databases
 Url: http://gborg.postgresql.org/project/psqlodbc
@@ -38,9 +38,11 @@ autoconf
 
 %build
 
-# Note: the package's build infrastructure does not seem to provide a sane
-# way to build or install both the ANSI and Unicode versions of the driver.
-# Ideally we should install both, but for now, Unicode only.
+# Note: we choose to build only the Unicode version of the driver, which
+# we then install under the old library name "psqlodbc.so".  We are not
+# adopting the "psqlodbcw.so" naming convention because current upstream
+# plans are to revert back to the old name in the next release.  We can
+# always track the name change later if they change their minds ...
 
 %configure --with-unixodbc --with-odbcinst=%{_sysconfdir}
 make
@@ -50,8 +52,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 
-# Create a symlink to avoid breaking existing odbcinst.ini scripts.
-ln -s psqlodbcw.so ${RPM_BUILD_ROOT}%{_libdir}/psqlodbc.so
+# rename as per above note, and remove the rather useless .la file
+pushd ${RPM_BUILD_ROOT}%{_libdir}
+	mv psqlodbcw.so psqlodbc.so
+	rm psqlodbcw.la
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,11 +66,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/psqlodbcw.so
-%{_libdir}/psqlodbcw.la
-%{_libdir}/psqlodbc.so
+%attr(755,root,root) %{_libdir}/psqlodbc.so
+%doc license.txt readme.txt docs/*
 
 %changelog
+* Wed Mar 22 2006 Tom Lane <tgl@redhat.com> 08.01.0200-2
+- Change library name back to psqlodbc.so, because it appears that upstream
+  will revert to that name in next release; no point in thrashing the name.
+- Include documentation files unaccountably omitted before (bug #184158)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 08.01.0200-1.2
 - bump again for double-long bug on ppc(64)