diff --git a/.cvsignore b/.cvsignore
index e69de29..559e646 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1,3 @@
+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-incubator-disclaimer-resource-bundle-1.1.pom b/apache-incubator-disclaimer-resource-bundle-1.1.pom
new file mode 100644
index 0000000..2495577
--- /dev/null
+++ b/apache-incubator-disclaimer-resource-bundle-1.1.pom
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache-resource-bundles</artifactId>
+    <version>2</version>
+  </parent>
+  <artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
+  <name>Apache Incubator Disclaimer Resource Bundle</name>
+  <version>1.1</version>
+  <inceptionYear>2006</inceptionYear>
+  <description>
+    An archive which contains the standard Apache Incubator disclaimer.
+  </description>
+</project>
diff --git a/apache-jar-resource-bundle-1.4.pom b/apache-jar-resource-bundle-1.4.pom
new file mode 100644
index 0000000..0e32dae
--- /dev/null
+++ b/apache-jar-resource-bundle-1.4.pom
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache-resource-bundles</artifactId>
+    <version>2</version>
+  </parent>
+  <artifactId>apache-jar-resource-bundle</artifactId>
+  <name>Apache JAR Resource Bundle</name>
+  <version>1.4</version>
+  <inceptionYear>2006</inceptionYear>
+  <description>
+    An archive which contains templates for generating the necessary license files and notices for all Apache releases.
+  </description>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</developerConnection>
+    <url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</url>
+  </scm>
+</project>
diff --git a/apache-license-header-resource-bundle-1.1.pom b/apache-license-header-resource-bundle-1.1.pom
new file mode 100644
index 0000000..e595bac
--- /dev/null
+++ b/apache-license-header-resource-bundle-1.1.pom
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache-resource-bundles</artifactId>
+    <version>2</version>
+  </parent>
+  <artifactId>apache-license-header-resource-bundle</artifactId>
+  <name>Apache License Header Resource Bundle</name>
+  <version>1.1</version>
+  <inceptionYear>2006</inceptionYear>
+  <description>
+    An archive which contains the notice file template.
+  </description>
+</project>
diff --git a/apache-resource-bundles-2.pom b/apache-resource-bundles-2.pom
new file mode 100644
index 0000000..470cfc3
--- /dev/null
+++ b/apache-resource-bundles-2.pom
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>5</version>
+    <relativePath>../pom/maven/pom.xml</relativePath>
+  </parent>
+  <packaging>pom</packaging>
+  <groupId>org.apache</groupId>
+  <artifactId>apache-resource-bundles</artifactId>
+  <name>Apache Resource Bundles</name>
+  <version>2</version>
+  <inceptionYear>2006</inceptionYear>
+  <modules>
+    <module>apache-jar-resource-bundle</module>
+    <module>apache-license-header-resource-bundle</module>
+    <module>apache-incubator-disclaimer-resource-bundle</module>         
+  </modules>
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</developerConnection>
+    <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>      
+        <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
new file mode 100644
index 0000000..2bffc13
--- /dev/null
+++ b/apache-resource-bundles-cleanup-poms.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..a315346
--- /dev/null
+++ b/apache-resource-bundles.spec
@@ -0,0 +1,159 @@
+%global jar_version 1.4
+%global lh_version 1.1
+%global id_version 1.1
+
+Name:		apache-resource-bundles
+Version:	2
+Release:	3%{?dist}
+Summary:	Apache Resource Bundles
+
+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
+
+# Remove maven-release plugin (not yet available on Fedora)
+Patch0:		apache-resource-bundles-cleanup-poms.patch
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	maven2
+BuildRequires:	maven2-plugin-compiler
+BuildRequires:	maven2-plugin-install
+BuildRequires:	maven2-plugin-jar
+BuildRequires:	maven2-plugin-remote-resources
+BuildRequires:	maven2-plugin-resources
+BuildRequires:	maven-surefire-maven-plugin
+
+# Requirements from the POMs
+Requires:	maven2-plugin-remote-resources
+
+Requires(post):	jpackage-utils
+Requires(postun): jpackage-utils
+
+BuildArch:	noarch
+
+%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
+%patch0 -p1
+
+# jar
+mkdir -p apache-jar-resource-bundle
+pushd apache-jar-resource-bundle
+jar xvf %SOURCE1
+cp %SOURCE2 ./pom.xml
+mkdir -p src/main/resources
+mv META-INF src/main/resources
+popd
+
+# license-header
+mkdir -p apache-license-header-resource-bundle
+pushd apache-license-header-resource-bundle
+jar xvf %SOURCE3
+cp %SOURCE4 ./pom.xml
+mkdir -p src/main/resources
+mv META-INF src/main/resources
+popd
+
+# incubator-disclaimer
+mkdir -p apache-incubator-disclaimer-resource-bundle
+pushd apache-incubator-disclaimer-resource-bundle
+jar xvf %SOURCE5
+cp %SOURCE6 ./pom.xml
+mkdir -p src/main/resources
+mv META-INF src/main/resources
+popd
+
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+	install
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+
+# jar
+# 
+pushd apache-jar-resource-bundle
+install -m 644 \
+	target/apache-jar-resource-bundle-%{jar_version}.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}/jar-%{jar_version}.jar
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-jar-resource-bundle.pom
+%add_to_maven_depmap org.apache apache-jar-resource-bundle %{jar_version} JPP %{name}/jar
+popd
+
+# license-header
+pushd apache-license-header-resource-bundle
+install -m 644 \
+	target/apache-license-header-resource-bundle-%{lh_version}.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}/license-header-%{lh_version}.jar
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-license-header-resource-bundle.pom
+%add_to_maven_depmap org.apache apache-license-header-resource-bundle %{lh_version} JPP %{name}/license-header
+popd
+
+# incubator-disclaimer
+pushd apache-incubator-disclaimer-resource-bundle
+install -m 644 \
+	target/apache-incubator-disclaimer-resource-bundle-%{id_version}.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}/incubator-disclaimer-%{id_version}.jar
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-apache-incubator-disclaimer-resource-bundle.pom
+%add_to_maven_depmap org.apache apache-incubator-disclaimer-resource-bundle %{id_version} JPP %{name}/incubator-disclaimer
+popd
+
+# Unversioned jars
+pushd $RPM_BUILD_ROOT%{_javadir}/%{name}
+ln -sf jar-%{jar_version}.jar jar.jar
+ln -sf license-header-%{lh_version}.jar license-header.jar
+ln -sf incubator-disclaimer-%{id_version}.jar incubator-disclaimer.jar
+popd
+
+# Add parent to depmap too
+cp pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.apache %{name} %{version} JPP %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/%{name}
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*.pom
+
+
+
+%changelog
+* Mon Feb  1 2010 Mary Ellen Foster <mefoster at gmail.com> 2-3
+- Fix license 
+
+* Tue Jan 19 2010 Mary Ellen Foster <mefoster at gmail.com> 2-2
+- Add plugin dependencies from POMs
+- Fix description
+- Remove maven-release plugin (not on Fedora yet)
+
+* Mon Jan 18 2010 Mary Ellen Foster <mefoster at gmail.com> 2-1
+- Initial package
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..2fe397b
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+apache-resource-bundles-2-3_fc12:HEAD:apache-resource-bundles-2-3.fc12.src.rpm:1265106342
diff --git a/sources b/sources
index e69de29..49e42a6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,3 @@
+a45167b6e6ef6acc22d02592cd34b1aa  apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
+489c1bbdc4b710bff7380342bccfacb1  apache-jar-resource-bundle-1.4-sources.jar
+fd056a1ca286681e62ef91039f380433  apache-license-header-resource-bundle-1.1-sources.jar