diff --git a/postgresql-odbc.spec b/postgresql-odbc.spec
index 35c46c1..9bb928f 100644
--- a/postgresql-odbc.spec
+++ b/postgresql-odbc.spec
@@ -8,51 +8,27 @@ URL: http://psqlodbc.projects.postgresql.org/
 
 Source0: http://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-%{version}.tar.gz
 
-# CAUTION: acinclude.m4 has to be kept in sync with package's aclocal.m4.
-# This is a kluge that ought to go away, but upstream currently isn't
-# shipping their custom macros anywhere except in aclocal.m4.  (The macros
-# actually come from the Postgres source tree, but we haven't got that
-# available while building this RPM.)  To generate: in psqlodbc source tree,
-#   aclocal -I . -I $PGSRC/config
-# then strip aclocal.m4 down to just the PGAC macros.
-# BUT: as of 09.01.0200, configure.ac hasn't been updated to use latest
-# PG macros, so keep using the previous version of acinclude.m4.
-Source1: acinclude.m4
-
 BuildRequires: unixODBC-devel
 BuildRequires: libtool automake autoconf postgresql-devel
 BuildRequires: openssl-devel krb5-devel pam-devel zlib-devel readline-devel
 
-# This spec file and ancillary files are licensed in accordance with 
+# This spec file and ancillary files are licensed in accordance with
 # the psqlodbc license.
 
 %description
 This package includes the driver needed for applications to access a
 PostgreSQL system via ODBC (Open Database Connectivity).
 
+
 %prep
 %setup -q -n psqlodbc-%{version}
 
-# Some missing macros.  Courtesy Owen Taylor <otaylor@redhat.com>.
-cp -p %{SOURCE1} .
-
-# Use build system's libtool.m4, not the one in the package.
-rm -f libtool.m4 config/libtool.m4
-
-libtoolize --force  --copy
-aclocal -I .
-automake --add-missing --copy
-autoconf
-autoheader
 
 %build
-
 %configure --with-unixodbc --disable-dependency-tracking
-
-make
+make %{?_smp_mflags}
 
 %install
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Provide the old library name "psqlodbc.so" as a symlink,
@@ -66,7 +42,7 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%attr(755,root,root) %{_libdir}/psqlodbcw.so
+%{_libdir}/psqlodbcw.so
 %{_libdir}/psqlodbc.so
 %doc license.txt readme.txt docs/*
 
@@ -205,7 +181,7 @@ Related: #845110
 - import new community version 07.03.0200
 
 * Mon Sep 15 2003 Andrew Overholt <overholt@redhat.com> 7.3-3
-- autotools fixes (courtesy Alex Oliva <aoliva@redhat.com> and 
+- autotools fixes (courtesy Alex Oliva <aoliva@redhat.com> and
   Owen Taylor <otaylor@redhat.com>)
 
 * Tue Jul 08 2003 Andrew Overholt <overholt@redhat.com> 7.3-3