diff --git a/.cvsignore b/.cvsignore
index 2d5fb13..6e6a8af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Base-1.7.tgz
+Base-1.8.tgz
diff --git a/php-ezc-Base.spec b/php-ezc-Base.spec
index c7fe05b..40d4d85 100644
--- a/php-ezc-Base.spec
+++ b/php-ezc-Base.spec
@@ -3,8 +3,8 @@
 %define channel components.ez.no
 
 Name:           php-ezc-Base
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Provides the basic infrastructure that all packages rely on
 
 Group:          Development/Libraries
@@ -32,8 +32,8 @@ Therefore every component relies on this package.
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+[ -f package2.xml ] || %{__mv} package.xml package2.xml
+%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -44,23 +44,23 @@ cd %{pear_name}-%{version}
 
 %install
 cd %{pear_name}-%{version}
-rm -rf %{buildroot} docdir
+%{__rm} -rf %{buildroot} docdir
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Move documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
-rm -rf %{buildroot}%{pear_docdir}
+%{__mv} %{buildroot}%{pear_docdir}/%{pear_name}/docs ./docdir
+%{__rm} -rf %{buildroot}%{pear_docdir}
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+%{__rm} -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+%{__mkdir} -p %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -87,17 +87,20 @@ fi
 
 
 %changelog
+* Thu Dec 24 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.8-1
+- upstream 1.8
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Jun 29 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.7-1
-- Update to 1.7
+- upstream 1.7
 
 * Sun Feb 22 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-2
 - Add owner to %%{pear_phpdir}/ezc and %%{pear_phpdir}/ezc/autoload
 
 * Mon Feb 09 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6.1-1
-- Update to 1.6.1
+- upstream 1.6.1
 
 * Thu Feb 03 2009 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.6-1
 - Initial packaging
diff --git a/sources b/sources
index 1bedf09..318c1ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ac3d6a7fa119dd4e895ce5fb216dc75  Base-1.7.tgz
+f00eb71187ef9903bd1c2f7cdae3216a  Base-1.8.tgz