diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 18420b5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aduna-commons-text
-# $Id$
-NAME := aduna-commons-text
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/aduna-commons-text-2.6.0.pom b/aduna-commons-text-2.6.0.pom
new file mode 100644
index 0000000..ed52377
--- /dev/null
+++ b/aduna-commons-text-2.6.0.pom
@@ -0,0 +1,61 @@
+<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>info.aduna.commons</groupId>
+		<artifactId>aduna-commons</artifactId>
+		<version>16</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>aduna-commons-text</artifactId>
+	<version>2.6.0</version>
+
+	<name>Aduna Commons: Text</name>
+	<description>Manipulate/transform/parse text in various ways.</description>
+
+	<organization>
+		<name>Aduna</name>
+		<url>http://www.aduna-software.com/</url>
+	</organization>
+
+	<licenses>
+		<license>
+			<name>Aduna BSD license</name>
+			<url>http://repo.aduna-software.org/legal/aduna-bsd.txt</url>
+			<distribution>repo</distribution>
+			<comments>A BSD-style OSS license</comments>
+		</license>
+	</licenses>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>  
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive> 
+				</configuration>
+			</plugin>  
+			<plugin>   
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>info.aduna.text</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<scm>
+		<connection>scm:svn:http://repo.aduna-software.org/svn/info.aduna/commons/text/tags/2.6.0</connection>
+		<developerConnection>scm:svn:https://repo.aduna-software.org/svn/info.aduna/commons/text/tags/2.6.0</developerConnection>
+		<url>http://repo.aduna-software.org/websvn/listing.php?repname=aduna&amp;path=/info.aduna/commons/text/branches/2.6?repname=aduna&amp;path=/info.aduna/commons/text/tags/2.6.0?repname=aduna&amp;path=/info.aduna/commons/text/branches/2.6?repname=aduna&amp;path=/info.aduna/commons/text/trunk/</url>
+	</scm>
+
+</project>
diff --git a/aduna-commons-text.spec b/aduna-commons-text.spec
new file mode 100644
index 0000000..9202c33
--- /dev/null
+++ b/aduna-commons-text.spec
@@ -0,0 +1,143 @@
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+
+Name:		aduna-commons-text
+Version:	2.6.0
+Release:	3%{?dist}
+Summary:	Manipulate/transform/parse text in various ways
+
+Group:		Development/Libraries
+License:	BSD
+URL:		http://www.aduna-software.com/
+Source0:	http://repo.aduna-software.org/maven2/releases/info/aduna/commons/%{name}/%{version}/%{name}-%{version}-sources.jar
+Source1:	http://repo.aduna-software.org/maven2/releases/info/aduna/commons/%{name}/%{version}/%{name}-%{version}.pom
+
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	jpackage-utils >= 0:1.7.5
+BuildRequires:	aduna-commons-pom
+BuildRequires:	maven2-plugin-install
+BuildRequires:	maven2-plugin-jar
+BuildRequires:	maven2-plugin-resources
+BuildRequires:	maven-doxia-sitetools
+BuildRequires:	maven-surefire-maven-plugin
+
+Requires:	aduna-commons-pom
+
+Requires:	jpackage-utils >= 0:1.7.5
+Requires(post):	jpackage-utils >= 0:1.7.5
+Requires(postun): jpackage-utils >= 0:1.7.5
+
+%if %{with_gcj}
+BuildRequires:	java-gcj-compat-devel >= 1.0.31
+Requires(post):	java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+%else
+BuildArch:	noarch
+%endif
+
+
+%description
+%{summary}.
+
+
+%package javadoc
+Summary:	Javadoc for %{name}
+Group:		Documentation
+Requires:	jpackage-utils >= 0:1.7.5
+Requires:	%{name} = %{version}-%{release}
+BuildArch:	noarch
+
+%description javadoc
+%{summary}.
+
+
+%prep
+%setup -c -q
+cp %SOURCE1 ./pom.xml
+mkdir -p src/main/java
+mv info src/main/java
+
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+%build
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+	install javadoc:javadoc
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+
+install -m 644 target/%{name}-%{version}.jar \
+	$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+
+%if %{with_gcj}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%add_to_maven_depmap info.aduna.commons %{name} %{version} JPP %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+%if %{with_gcj}
+  if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+    %{_bindir}/rebuild-gcj-db
+  fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{with_gcj}
+  if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+    %{_bindir}/rebuild-gcj-db
+  fi
+%endif
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*.jar
+%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*.pom
+%if %{with_gcj}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+
+
+%changelog
+* Tue Feb 23 2010 Mary Ellen Foster <mefoster at gmail.com> 2.6.0-3
+- Remove BuildRequirements that are pulled in by aduna-commons POM
+- Require the main package in the javadoc
+
+* Thu Feb 11 2010 Mary Ellen Foster <mefoster at gmail.com> 2.6.0-2
+- Add BR maven-doxia-sitetools
+- Fix changelog dates
+
+* Wed Feb 10 2010 Mary Ellen Foster <mefoster at gmail.com> 2.6.0-1
+- Update to 2.6.0 in preparation for review
+
+* Tue Nov 17 2009 Mary Ellen Foster <mefoster at gmail.com> 2.4.0-1
+- Initial package
diff --git a/sources b/sources
index e69de29..5ab03f5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cdd124d4ee61875767d57df937b37d4b  aduna-commons-text-2.6.0-sources.jar