diff --git a/.gitignore b/.gitignore
index 0df6d11..f863076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
 SOURCES/apache-jar-resource-bundle-1.4-sources.jar
 SOURCES/apache-license-header-resource-bundle-1.1-sources.jar
+/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
+/apache-jar-resource-bundle-1.4-sources.jar
+/apache-license-header-resource-bundle-1.1-sources.jar
diff --git a/apache-resource-bundles-30.pom b/apache-resource-bundles-30.pom
deleted file mode 100644
index 191305c..0000000
--- a/apache-resource-bundles-30.pom
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>30</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <groupId>org.apache.apache.resources</groupId>
-  <artifactId>apache-resource-bundles</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Apache Resource Bundles</name>
-  <inceptionYear>2006</inceptionYear>
-
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/maven-parent-30/apache-resource-bundles</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/maven-parent-30/apache-resource-bundles</developerConnection>
-    <url>https://svn.apache.org/viewcvs.cgi/maven/resources/tags/maven-parent-30/apache-resource-bundles</url>
-  </scm>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>https://issues.apache.org/jira/browse/MASFRES</url>
-  </issueManagement>
-
-  <ciManagement>
-    <url>https://builds.apache.org/job/maven-project-resources/</url>
-    <system>Jenkins</system>
-  </ciManagement>
-
-  <!-- There is no distributionManagement for this project. The site is a part of the main Maven site. -->
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changes-plugin</artifactId>
-          <configuration>
-            <issueManagementSystems>
-              <issueManagementSystem>JIRA</issueManagementSystem>
-            </issueManagementSystems>
-            <maxEntries>1000</maxEntries>
-            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-            <versionPrefix>${project.artifactId}-</versionPrefix>
-            <!-- Used by announcement-generate goal -->
-<!-- TODO Which template should we use for Apache Resource Bundles?            
-            <templateDirectory>org/apache/maven/shared</templateDirectory>
--->
-            <!-- Used by announcement-mail goal -->
-            <subject>[ANN] ${project.name} ${project.version} Released</subject>
-            <toAddresses>
-              <toAddress implementation="java.lang.String">announce@apache.org</toAddress>
-              <toAddress implementation="java.lang.String">announce@maven.apache.org</toAddress>
-              <toAddress implementation="java.lang.String">users@maven.apache.org</toAddress>
-            </toAddresses>
-            <ccAddresses>
-              <ccAddress implementation="java.lang.String">dev@maven.apache.org</ccAddress>
-            </ccAddresses>
-            <!-- These values need to be specified as properties in the profile apache-release in your settings.xml -->
-            <fromDeveloperId>${apache.availid}</fromDeveloperId>
-            <smtpHost>${smtp.host}</smtpHost>
-          </configuration>
-          <dependencies>
-            <!-- Used by announcement-generate goal -->
-<!-- Uncomment this when we have decided which template to use
-            <dependency>
-              <groupId>org.apache.maven.shared</groupId>
-              <artifactId>maven-shared-resources</artifactId>
-              <version>1</version>
-            </dependency>
--->
-          </dependencies>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- Turn this into a lifecycle -->
-      <plugin>      
-        <artifactId>maven-remote-resources-plugin</artifactId>        
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/apache-resource-bundles-cleanup-poms.patch b/apache-resource-bundles-cleanup-poms.patch
deleted file mode 100644
index 2bffc13..0000000
--- a/apache-resource-bundles-cleanup-poms.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- apache-resource-bundles-2/pom.xml.orig	2010-01-19 10:29:54.688919029 +0000
-+++ apache-resource-bundles-2/pom.xml	2010-01-19 10:30:08.671919266 +0000
-@@ -24,17 +24,6 @@
-     <url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</url>
-   </scm>
-   <build>
--    <pluginManagement>
--      <plugins>
--        <plugin>
--          <artifactId>maven-release-plugin</artifactId>
--          <version>2.0-beta-4</version>
--          <configuration>
--            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
--          </configuration>
--        </plugin>
--      </plugins>
--    </pluginManagement>
-     <plugins>
-       <!-- Turn this into a lifecycle -->
-       <plugin>      
diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec
index d081e45..9bb354c 100644
--- a/apache-resource-bundles.spec
+++ b/apache-resource-bundles.spec
@@ -2,46 +2,39 @@
 %global lh_version 1.1
 %global id_version 1.1
 
-Name:		apache-resource-bundles
-Version:	2
-Release:	11%{?dist}
-Summary:	Apache Resource Bundles
+Name:           apache-resource-bundles
+Version:        2
+Release:        20%{?dist}
+Summary:        Apache Resource Bundles
+License:        ASL 2.0
+URL:            http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
+BuildArch:      noarch
 
-Group:		Development/Libraries
-License:	ASL 2.0
-URL:		http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
-Source0:	http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
-Source1:	http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
-Source2:	http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
-Source3:	http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
-Source4:	http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
-Source5:	http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
-Source6:	http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
+Source0:        http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
+Source1:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
+Source2:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
+Source3:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
+Source4:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
+Source5:        http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
+Source6:        http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
 
-BuildRequires:	maven-local
-BuildRequires:	maven-compiler-plugin
-BuildRequires:	maven-install-plugin
-BuildRequires:	maven-jar-plugin
-BuildRequires:	maven-remote-resources-plugin
-BuildRequires:	maven-resources-plugin
-BuildRequires:	maven-surefire-plugin
-BuildRequires:  maven-site-plugin
-
-BuildArch:	noarch
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
 
 %description
 An archive which contains templates for generating the necessary license files
 and notices for all Apache releases.
 
 %prep
-%setup -c -T
-cp %SOURCE0 ./pom.xml
+%setup -cT
+cp -p %{SOURCE0} ./pom.xml
 
 # jar
 mkdir -p apache-jar-resource-bundle
 pushd apache-jar-resource-bundle
-jar xvf %SOURCE1
-cp %SOURCE2 ./pom.xml
+jar xvf %{SOURCE1}
+cp -p %{SOURCE2} ./pom.xml
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
@@ -49,8 +42,8 @@ popd
 # license-header
 mkdir -p apache-license-header-resource-bundle
 pushd apache-license-header-resource-bundle
-jar xvf %SOURCE3
-cp %SOURCE4 ./pom.xml
+jar xvf %{SOURCE3}
+cp -p %{SOURCE4} ./pom.xml
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
@@ -58,17 +51,17 @@ popd
 # incubator-disclaimer
 mkdir -p apache-incubator-disclaimer-resource-bundle
 pushd apache-incubator-disclaimer-resource-bundle
-jar xvf %SOURCE5
-cp %SOURCE6 ./pom.xml
+jar xvf %{SOURCE5}
+cp -p %{SOURCE6} ./pom.xml
 mkdir -p src/main/resources
 mv META-INF src/main/resources
 popd
 
-
-%build
 %mvn_file :apache-jar-resource-bundle apache-resource-bundles/jar
 %mvn_file :apache-license-header-resource-bundle apache-resource-bundles/license-header
 %mvn_file :apache-incubator-disclaimer-resource-bundle apache-resource-bundles/incubator-disclaimer
+
+%build
 %mvn_build
 
 %install
@@ -77,8 +70,35 @@ popd
 %files -f .mfiles
 
 %changelog
-* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2-11
-- Mass rebuild 2013-12-27
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-15
+- Cleanup spec file
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-13
+- Use Requires: java-headless rebuild (#1067528)
+
+* Wed Feb 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-12
+- Fix unowned directory
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2-10
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
diff --git a/sources b/sources
index 9b19d1b..52356b8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA1 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 1b81c0751b2131074eebce60c86289824c98615c
-SHA1 (apache-jar-resource-bundle-1.4-sources.jar) = 392dfe3fd871d56d1edc48479fdff65013c801d9
-SHA1 (apache-license-header-resource-bundle-1.1-sources.jar) = 2b61357efc85d89ac1e96b6ac6309a6872819116
+SHA512 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 4095b22b344a2e0e44a04cdb26f89db16e6b11e57fb5584caf7ecef0f9d2bb40fb188832d371c375ab917ea2d72445ac7a7387f6353d3b3c1d93266c71c3d4e9
+SHA512 (apache-jar-resource-bundle-1.4-sources.jar) = 55dae4fb13624f083e049c5e9b1556f325c392f734ba034763091261f19239a13c5e2497fcaba190582d820074be0ee8d1ba91e8509bf5a0c91eb8c509b980b3
+SHA512 (apache-license-header-resource-bundle-1.1-sources.jar) = 055ebd253138231c96388ee51b1b0c4013c20b5a16fb124ceb404ae466535e3303d0d07b8fa6794889d9159755d18e40518d5b07c142cdd6cee74d78aca0befc