diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..b93346f
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+This package has been renamed to apache-commons-fileupload in F14+
\ No newline at end of file
diff --git a/jakarta-commons-fileupload-crosslink.patch b/jakarta-commons-fileupload-crosslink.patch
deleted file mode 100644
index 8df94a9..0000000
--- a/jakarta-commons-fileupload-crosslink.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- build.xml 2007-04-17 11:13:49.000000000 -0400
-+++ build.xml 2007-04-17 11:14:09.000000000 -0400
-@@ -136,6 +136,7 @@
-
-
-
-+
-
-
-
-@@ -156,4 +157,4 @@
-
-
-
--
-\ No newline at end of file
-+
diff --git a/jakarta-commons-fileupload-remove-portlet.patch b/jakarta-commons-fileupload-remove-portlet.patch
deleted file mode 100644
index 82b2599..0000000
--- a/jakarta-commons-fileupload-remove-portlet.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ur commons-fileupload-1.2.1-src.orig/pom.xml commons-fileupload-1.2.1-src/pom.xml
---- commons-fileupload-1.2.1-src.orig/pom.xml 2009-11-23 14:02:56.527724643 +0000
-+++ commons-fileupload-1.2.1-src/pom.xml 2009-11-23 14:03:18.261662818 +0000
-@@ -147,44 +147,6 @@
-
-
-
-- maven-jar-plugin
--
--
--
--
-- org.apache.commons.fileupload
-- http://www.apache.org/licenses/LICENSE-2.0.txt
-- 2
-- Apache Commons FileUpload Bundle
-- ${project.organization.name}
-- ${project.version}
--
--org.apache.commons.fileupload;version=${project.version},
--org.apache.commons.fileupload.disk;version=${project.version},
--org.apache.commons.fileupload.portlet;version=${project.version},
--org.apache.commons.fileupload.servlet;version=${project.version},
--org.apache.commons.fileupload.util;version=${project.version}
--
--
--org.apache.commons.fileupload;version=${project.version},
--org.apache.commons.fileupload.disk;version=${project.version},
--org.apache.commons.fileupload.portlet;version=${project.version},
--org.apache.commons.fileupload.servlet;version=${project.version},
--org.apache.commons.fileupload.util;version=${project.version},
--org.apache.commons.io,
--org.apache.commons.io.output,
--javax.servlet,
--javax.servlet.http
--
-- javax.portlet
--
--
--
--
--
- maven-javadoc-plugin
-
- Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.
-@@ -216,12 +178,6 @@
- provided
-
-
-- portlet-api
-- portlet-api
-- 1.0
-- provided
--
--
- commons-io
- commons-io
- 1.3.2
diff --git a/jakarta-commons-fileupload-servletapi5.patch b/jakarta-commons-fileupload-servletapi5.patch
deleted file mode 100644
index b5bb8f2..0000000
--- a/jakarta-commons-fileupload-servletapi5.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/test/org/apache/commons/fileupload/MyHttpServletRequest.java.orig 2007-04-17 11:21:13.000000000 -0400
-+++ src/test/org/apache/commons/fileupload/MyHttpServletRequest.java 2007-04-17 11:24:29.000000000 -0400
-@@ -366,6 +366,14 @@ class MyHttpServletRequest implements Ht
- }
-
- /**
-+ * @see javax.servlet.ServletRequest#getLocalName()
-+ */
-+ public String getLocalName()
-+ {
-+ return null;
-+ }
-+
-+ /**
- * @see javax.servlet.ServletRequest#getServerPort()
- */
- public int getServerPort()
-@@ -374,6 +382,22 @@ class MyHttpServletRequest implements Ht
- }
-
- /**
-+ * @see javax.servlet.ServletRequest#getRemotePort()
-+ */
-+ public int getRemotePort()
-+ {
-+ return 0;
-+ }
-+
-+ /**
-+ * @see javax.servlet.ServletRequest#getLocalPort()
-+ */
-+ public int getLocalPort()
-+ {
-+ return 0;
-+ }
-+
-+ /**
- * @see javax.servlet.ServletRequest#getReader()
- */
- public BufferedReader getReader() throws IOException
-@@ -390,6 +414,14 @@ class MyHttpServletRequest implements Ht
- }
-
- /**
-+ * @see javax.servlet.ServletRequest#getLocalAddr()
-+ */
-+ public String getLocalAddr()
-+ {
-+ return null;
-+ }
-+
-+ /**
- * @see javax.servlet.ServletRequest#getRemoteHost()
- */
- public String getRemoteHost()
diff --git a/jakarta-commons-fileupload.spec b/jakarta-commons-fileupload.spec
deleted file mode 100644
index db4c758..0000000
--- a/jakarta-commons-fileupload.spec
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define base_name fileupload
-%define short_name commons-%{base_name}
-
-Name: jakarta-%{short_name}
-Version: 1.2.1
-Release: 1%{?dist}
-Summary: This package provides an api to work with html file upload
-License: ASL 1.1
-Group: Development/Libraries/Java
-Epoch: 1
-Source0: http://apache.mirror.infiniteconflict.com/commons/fileupload/source/commons-fileupload-1.2.1-src.tar.gz
-
-# Portlets are not in Fedora yet
-Patch0: %{name}-remove-portlet.patch
-
-URL: http://jakarta.apache.org/commons/fileupload/
-BuildRequires: junit >= 0:3.8.1
-BuildRequires: servlet_2_4_api
-BuildRequires: tomcat5
-BuildRequires: jakarta-commons-io
-BuildRequires: maven2
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-doxia-sitetools
-
-Requires: jpackage-utils
-Requires: jakarta-commons-io
-Requires: servlet24
-
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: %{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{short_name} < %{epoch}:%{version}-%{release}
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
-%description
-The javax.servlet package lacks support for rfc 1867, html file
-upload. This package provides a simple to use api for working with
-such data. The scope of this package is to create a package of Java
-utility classes to read multipart/form-data within a
-javax.servlet.http.HttpServletRequest
-
-%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
-
-%description javadoc
-Javadoc for %{name}.
-
-# -----------------------------------------------------------------------------
-
-%prep
-%setup -q -n %{short_name}-%{version}-src
-
-# Remove portlet stuff
-%patch0 -p1
-rm -rf src/java/org/apache/commons/fileupload/portlet
-rm -f src/test/org/apache/commons/fileupload/*Portlet*
-
-# -----------------------------------------------------------------------------
-
-%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
-
-# jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{short_name}.pom
-
-# -----------------------------------------------------------------------------
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-# -----------------------------------------------------------------------------
-
-%post
-%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%files
-%defattr(0644,root,root,0755)
-%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
-%config(noreplace) %{_mavendepmapfragdir}/*
-%{_datadir}/maven2/poms/*.pom
-
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
-
-%files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
-
-# -----------------------------------------------------------------------------
-
-%changelog
-* Wed Jan 6 2010 Mary Ellen Foster - 1:1.2.1-1
-- Update to newest version; include Maven metadata
-
-* Fri Jul 24 2009 Fedora Release Engineering - 1:1.0-9.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering - 1:1.0-8.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.0-7.3
-- drop repotag
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering - 1:1.0-7jpp.2
-- Autorebuild for GCC 4.3
-
-* Tue Apr 17 2007 Permaine Cheung - 1:1.0-6jpp.2
-- Update spec file as per fedora review
-
-* Thu Aug 10 2006 Deepak Bhole - 1:1.0-6jpp.1
-- Added missing requirements.
-
-* Thu Aug 10 2006 Karsten Hopp 1.0-5jpp_3fc
-- Requires(post/postun): coreutils
-
-* Sat Jul 22 2006 Jakub Jelinek - 1:1.0-5jpp_2fc
-- Rebuilt
-
-* Thu Jul 20 2006 Deepak Bhole - 1:1.0-5jpp_1fc
-- Added conditional native compilation.
-
-* Wed Apr 26 2006 Fernando Nasser - 1:1.0-4jpp
-- First JPP 1.7 build
-
-* Fri Oct 22 2004 Fernando Nasser - 1:1.0-3jpp
-- Patch to build with servletapi5
-- Add missing dependency on ant-junit
-
-* Sun Aug 23 2004 Randy Watler - 1:1.0-2jpp
-- Rebuild with ant-1.6.2
-
-* Sat Jun 28 2003 Ville Skyttä - 1:1.0-1jpp
-- Update to 1.0.
-- Add Epochs to dependencies.
-- Nuke beanutils dependency.
-- Versionless javadoc dir symlinks.
-
-* Tue Mar 25 2003 Nicolas Mailhot - 1:1.0-0.beta1.4jpp
-- for jpackage-utils 1.5
-
-* Mon Mar 10 2003 Henri Gomez - 1:1.0-0.beta1.3jpp
-- rebuild with correct ant (avoid corrupted archive)
-
-* Fri Mar 07 2003 Henri Gomez - 1:1.0-0.beta1.2jpp
-- replace servlet23 requirement by servlet4api
-
-* Wed Feb 26 2003 Ville Skyttä - 1:1.0-0.beta1.1jpp
-- Update to 1.0 beta 1 (no code changes from cvs20030115).
-- Fix requirements.
-
-* Wed Jan 15 2003 Henri Gomez 1.0-1jpp
-- 1.0 (cvs 20030115)
-- first jPackage release
diff --git a/sources b/sources
deleted file mode 100644
index b4d299c..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-c2bdb9264aec564e3f4fbbdf4344a844 commons-fileupload-1.2.1-src.tar.gz