diff --git a/php-pear-HTTP_WebDAV_Server.spec b/php-pear-HTTP_WebDAV_Server.spec
index ae59a42..f582739 100644
--- a/php-pear-HTTP_WebDAV_Server.spec
+++ b/php-pear-HTTP_WebDAV_Server.spec
@@ -1,16 +1,15 @@
 %define		_class		HTTP
 %define		_subclass	WebDAV
-%define		_status		beta
-%define		_pearname	%{_class}_%{_subclass}_Server
+%define		upstream_name	%{_class}_%{_subclass}_Server
 
-Summary:	%{_pearname} - WebDAV Server Baseclass
-Name:		php-pear-%{_pearname}
+Name:		php-pear-%{upstream_name}
 Version:	0.99.1
-Release:	%mkrel 11
+Release:	%mkrel 12
+Summary:	WebDAV Server Baseclass
 License:	PHP License
 Group:		Development/PHP
-Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tar.bz2
 URL:		http://pear.php.net/package/HTTP_WebDAV_Server/
+Source0:	http://download.pear.php.net/package/%{upstream_name}-%{version}.tar.bz2
 Requires(post): php-pear
 Requires(preun): php-pear
 Requires:	php-pear
@@ -18,69 +17,48 @@ Requires(post): php-pear
 Requires(preun): php-pear
 Requires:	php-pear-HTTP >= 1.0
 BuildArch:	noarch
-BuildRequires:	dos2unix
-BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
+BuildRequires:	php-pear
+BuildRoot:	%{_tmppath}/%{name}-%{version}
 
 %description
 Mostly RFC2518 compliant helper class for WebDAV server
 implementation.
 
-In PEAR status of this package is: %{_status}.
-
 %prep
-
 %setup -q -c
-
-find . -type d -perm 0700 -exec chmod 755 {} \;
-find . -type f -perm 0555 -exec chmod 755 {} \;
-find . -type f -perm 0444 -exec chmod 644 {} \;
-
-for i in `find . -type d -name CVS` `find . -type f -name .cvs\*` `find . -type f -name .#\*`; do
-    if [ -e "$i" ]; then rm -rf $i; fi >&/dev/null
-done
-
-# strip away annoying ^M
-find -type f | grep -v ".gif" | grep -v ".png" | grep -v ".jpg" | xargs dos2unix -U
+mv package.xml %{upstream_name}-%{version}/%{upstream_name}.xml
 
 %install
 rm -rf %{buildroot}
 
-install -d %{buildroot}%{_datadir}/pear/%{_class}/%{_subclass}/{db,Server,Tools}
+cd %{upstream_name}-%{version}
+pear install --nodeps --packagingroot %{buildroot} %{upstream_name}.xml
+rm -rf %{buildroot}%{_datadir}/pear/.??*
 
-install %{_pearname}-%{version}/*.php %{buildroot}%{_datadir}/pear/%{_class}/%{_subclass}
-install %{_pearname}-%{version}/Server/*.php %{buildroot}%{_datadir}/pear/%{_class}/%{_subclass}/Server
-install %{_pearname}-%{version}/db/*.sql %{buildroot}%{_datadir}/pear/%{_class}/%{_subclass}/db
-install %{_pearname}-%{version}/Tools/*.php %{buildroot}%{_datadir}/pear/%{_class}/%{_subclass}/Tools
+rm -rf %{buildroot}%{_datadir}/pear/docs
+rm -rf %{buildroot}%{_datadir}/pear/tests
 
 install -d %{buildroot}%{_datadir}/pear/packages
-install -m0644 package.xml %{buildroot}%{_datadir}/pear/packages/%{_pearname}.xml
-
-%post
-if [ "$1" = "1" ]; then
-	if [ -x %{_bindir}/pear -a -f %{_datadir}/pear/packages/%{_pearname}.xml ]; then
-		%{_bindir}/pear install --nodeps -r %{_datadir}/pear/packages/%{_pearname}.xml
-	fi
-fi
-if [ "$1" = "2" ]; then
-	if [ -x %{_bindir}/pear -a -f %{_datadir}/pear/packages/%{_pearname}.xml ]; then
-		%{_bindir}/pear upgrade -f --nodeps -r %{_datadir}/pear/packages/%{_pearname}.xml
-	fi
-fi
-
-%preun
-if [ "$1" = 0 ]; then
-	if [ -x %{_bindir}/pear -a -f %{_datadir}/pear/packages/%{_pearname}.xml ]; then
-		%{_bindir}/pear uninstall --nodeps -r %{_pearname}
-	fi
-fi
+install -m 644 %{upstream_name}.xml %{buildroot}%{_datadir}/pear/packages
 
 %clean
 rm -rf %{buildroot}
 
+%post
+%if %mdkversion < 201000
+pear install --nodeps --soft --force --register-only \
+    %{_datadir}/pear/packages/%{upstream_name}.xml >/dev/null || :
+%endif
+
+%preun
+%if %mdkversion < 201000
+if [ "$1" -eq "0" ]; then
+    pear uninstall --nodeps --ignore-errors --register-only \
+        %{pear_name} >/dev/null || :
+fi
+%endif
+
 %files
-%defattr(644,root,root,755)
-%{_datadir}/pear/%{_class}/%{_subclass}/*.php
-%{_datadir}/pear/%{_class}/%{_subclass}
-%{_datadir}/pear/packages/%{_pearname}.xml
-
-
+%defattr(-,root,root)
+%{_datadir}/pear/%{_class}
+%{_datadir}/pear/packages/%{upstream_name}.xml