diff --git a/.cvsignore b/.cvsignore
index 9ae8172..9446e6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 plexus-velocity-1.1.7-src.tar.gz
+plexus-velocity-1.1.8-src.tar.gz
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index b2bbf85..6281e36 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -31,25 +31,25 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define with_maven 0
-%define without_maven 1
+%define with_maven 1
+%define without_maven 0
 
 %define section     free
 %define parent plexus
 %define subname velocity
 
 Name:           plexus-velocity
-Version:        1.1.7
-Release:        3.3%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Velocity Component
 License:        ASL 2.0
 Group:          Development/Java
 URL:            http://plexus.codehaus.org/
-# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.7/
-# tar czf plexus-velocity-1.1.7-src.tar.gz plexus-velocity-1.1.7/
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.8/
+# tar czf plexus-velocity-1.1.8-src.tar.gz plexus-velocity-1.1.8/
 Source0:        plexus-velocity-%{version}-src.tar.gz
-Source1:        plexus-velocity-%{version}-build.xml
+Source1:        plexus-velocity-1.1.7-build.xml
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,7 +63,7 @@ BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
-BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-maven-plugin
 %endif
 BuildRequires:  ant-contrib
 BuildRequires:  ant-nodeps
@@ -177,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Dec 22 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.1.8-1
+- Update to upstream 1.1.8.
+
 * Fri Aug 21 2009 Andrew Overholt <overholt@redhat.com> 1.1.7-3.3
 - Add ant-nodeps BR
 
@@ -219,4 +222,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.1.2-1jpp
 - First JPackage build
-
diff --git a/sources b/sources
index b6e7de6..39e08a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99bf354c1f449006ac77366003d614c2  plexus-velocity-1.1.7-src.tar.gz
+f08d02035964fa6f7a6858846d55d3fa  plexus-velocity-1.1.8-src.tar.gz