diff --git a/php-pear-MDB2.spec b/php-pear-MDB2.spec
index 630bb37..60c784d 100644
--- a/php-pear-MDB2.spec
+++ b/php-pear-MDB2.spec
@@ -1,22 +1,23 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%define ClassName MDB2
 
 Name:           php-pear-MDB2
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Database Abstraction Layer
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://pear.php.net/package/MDB2
-Source0:        http://pear.php.net/get/MDB2-%{version}.tgz
+Source0:        http://pear.php.net/get/%{ClassName}-%{version}.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php php-pear(PEAR) >= 1.3.6
+Requires:       php-pear(PEAR) >= 1.3.6
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(MDB2) = %{version}
+Provides:       php-pear(%{ClassName}) = %{version}
 
 %description
 PEAR::MDB2 is a merge of the PEAR::DB and Metabase php database abstraction
@@ -30,18 +31,19 @@ portability.
 %prep
 %setup -q -c
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml MDB2-%{version}/MDB2.xml
+mv package2.xml %{ClassName}-%{version}/%{ClassName}.xml
+cd %{ClassName}-%{version}
 
 
 %build
-cd MDB2-%{version}
+cd %{ClassName}-%{version}
 # Empty build section, most likely nothing required.
 
 
 %install
-cd MDB2-%{version}
+cd %{ClassName}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT MDB2.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{ClassName}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -52,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 MDB2.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{ClassName}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -61,25 +63,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/MDB2.xml >/dev/null ||:
+    %{pear_xmldir}/%{ClassName}.xml >/dev/null ||:
 
 %postun
 if [ "$1" -eq "0" ]; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        MDB2 >/dev/null ||:
+        %{ClassName} >/dev/null ||:
 fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc MDB2-%{version}/docdir/MDB2/docs/*
-%{pear_xmldir}/MDB2.xml
-%{pear_testdir}/MDB2
-%{pear_phpdir}/MDB2
+%doc %{ClassName}-%{version}/docdir/%{ClassName}/docs/*
+%{pear_xmldir}/%{ClassName}.xml
+%{pear_testdir}/%{ClassName}
+%{pear_phpdir}/%{ClassName}
 %{pear_phpdir}/MDB2.php
 
 
 %changelog
+* Thu Sep 07 2006 Christopher Stone <chris.stone@gmail.com> 2.2.2-2
+- Sync up with latest pear template
+
 * Wed Sep 06 2006 Christopher Stone <chris.stone@gmail.com> 2.2.2-1
 - Upstream sync
 - Update spec to latest template