diff --git a/.gitignore b/.gitignore
index 687b190..433b9c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /apache-mime4j-0.6.1-src.tar.gz
 apache-mime4j-project-0.7.1-source-release.zip
 apache-mime4j-project-0.7.2-source-release.zip
+/james-mime4j-sources-0.8.1.zip
diff --git a/apache-mime4j.spec b/apache-mime4j.spec
index 24d1dc9..9577970 100644
--- a/apache-mime4j.spec
+++ b/apache-mime4j.spec
@@ -1,49 +1,49 @@
 Name:           apache-mime4j
-Version:        0.7.2
-Release:        17%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        Apache JAMES Mime4j
 License:        ASL 2.0
 URL:            http://james.apache.org/mime4j
 BuildArch:      noarch
 
-Source0:        http://apache.online.bg//james/mime4j/apache-mime4j-project-%{version}-source-release.zip
+Source0:        http://archive.apache.org/dist/james/mime4j/%{version}/james-mime4j-sources-%{version}.zip
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(com.google.guava:guava:18.0)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache:apache:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.james:james-project:pom:)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.apache.rat:apache-rat-plugin)
+BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires:  mvn(org.mockito:mockito-core)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
 
 %description
 Java stream based MIME message parser.
 
 %package javadoc
-Summary:        Javadoc for %{name}
+Summary: Javadoc for %{name}
 
 %description javadoc
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-project-%{version}
-rm -fr stage
-# prevents rat plugin from failing the build
-rm -fr DEPENDENCIES
+%setup -q -n james-mime4j
+
+# Disable plugins not needed for RPM builds
+%pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-jar-plugin
+
+# Don't need to build dist assembly
+%pom_disable_module assemble
 
 # Compat symlinks for jboss-as
 for p in core dom storage; do
   %mvn_file :*$p %{name}/%{name}-$p %{name}/$p
 done
 
-# Don't use deprecated "attached" goal of Maven Assembly Plugin, which
-# was removed in version 3.0.0.
-%pom_xpath_set "pom:plugin[pom:artifactId='maven-assembly-plugin']/pom:executions/pom:execution/pom:goals/pom:goal[text()='attached']" single assemble
-
 %build
 %mvn_build
 
@@ -58,6 +58,9 @@ done
 %license LICENSE NOTICE
 
 %changelog
+* Mon Apr 23 2018 Mat Booth <mat.booth@redhat.com> - 0.8.1-1
+- Update to latest upstream release
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c9e212..3304d0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4012a327e0c7a0ab11f323875765e33  apache-mime4j-project-0.7.2-source-release.zip
+SHA512 (james-mime4j-sources-0.8.1.zip) = 96c7d72d2c317a13d2e0fd18861ccf2336698521e5c4d2def6b2a6dfb092b02dc92e2c1af3475025670749e1eabda0943f514c8fda17974c69aab184eb3fc859