diff --git a/.gitignore b/.gitignore
index 861b427..961d31c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 commons-configuration-1.6-src.tar.gz
+/commons-configuration-1.8-src.tar.gz
diff --git a/0001-Change-ant-groupId-to-org.apache.ant.patch b/0001-Change-ant-groupId-to-org.apache.ant.patch
deleted file mode 100644
index f9ae838..0000000
--- a/0001-Change-ant-groupId-to-org.apache.ant.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2ab4b597ea7d2550fc8f66520ebf8819e5a3b52 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Mon, 14 Feb 2011 18:48:33 +0100
-Subject: [PATCH 1/2] Change ant groupId to org.apache.ant
-
----
- pom.xml |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 14aa243..36060d4 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -260,7 +260,7 @@
-             <artifactId>xerces</artifactId>
-         </exclusion>
-         <exclusion>
--            <groupId>ant</groupId>
-+            <groupId>org.apache.ant</groupId>
-             <artifactId>ant-optional</artifactId>
-         </exclusion>
-       </exclusions>
-@@ -297,7 +297,7 @@
-     </dependency>
- 
-     <dependency>
--      <groupId>ant</groupId>
-+      <groupId>org.apache.ant</groupId>
-       <artifactId>ant</artifactId>
-       <version>1.6.5</version>
-       <optional>true</optional>
--- 
-1.7.4
-
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index f838818..c61f437 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -3,15 +3,14 @@
 %global short_name      commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.6
-Release:        7%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Commons Configuration Package
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Patch0:         0001-Change-ant-groupId-to-org.apache.ant.patch
 BuildArch:      noarch
 
 BuildRequires:  java-devel
@@ -63,6 +62,13 @@ Requires(postun): jpackage-utils >= 1.7.2
 Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < 0:%{version}-%{release}
 
+# for 1.8
+Requires: apache-commons-vfs
+BuildRequires: apache-commons-vfs
+Requires: apache-commons-jexl
+BuildRequires: apache-commons-jexl
+BuildRequires: javacc-maven-plugin
+
 %description
 Configuration is a project to provide a generic Configuration
 interface and allow the source of the values to vary. It
@@ -90,7 +96,6 @@ Obsoletes:      jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %build
@@ -130,6 +135,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
 
 
 %changelog
+* Tue Jun 19 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-1
+- Update to upstream 1.8
+
 * Wed Apr 18 2012 Alexander Kurtakov <akurtako@redhat.com> 1.6-7
 - Update to current guidelines.
 - Move to servlet 3.
diff --git a/sources b/sources
index cb0bad3..97baa5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1caad868ead4e13fe3911494182a1e40  commons-configuration-1.6-src.tar.gz
+d875d81f386cac91ff1790cf08f9e1c5  commons-configuration-1.8-src.tar.gz