diff --git a/plexus-utils-3.1.0.tar.gz b/plexus-utils-3.1.0.tar.gz
deleted file mode 100644
index 19920b9..0000000
--- a/plexus-utils-3.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fe5204446f811201d022ced93ecd0833909ec1a1871321beab6883ad8cb4a7a
-size 427004
diff --git a/plexus-utils-3.1.1.tar.gz b/plexus-utils-3.1.1.tar.gz
new file mode 100644
index 0000000..ca19785
--- /dev/null
+++ b/plexus-utils-3.1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b129763f3e3198d0cf7926f08045fa58f696ba8032e43dc0afe4ff6bf1b1d3c0
+size 428079
diff --git a/plexus-utils-build.xml b/plexus-utils-build.xml
new file mode 100644
index 0000000..6ce1182
--- /dev/null
+++ b/plexus-utils-build.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="plexus-utils" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <property name="project.groupId" value="org.codehaus.plexus"/>
+  <property name="project.fragment" value="utils"/>
+  <property name="project.artifactId" value="plexus-${project.fragment}"/>
+  <property name="project.version" value="3.1.1"/>
+  <property name="project.name" value="Plexus Common Utilities"/>
+  <property name="project.description" value="A collection of various utility classes to ease working with strings, files, command lines, XML and more."/>
+  <property name="project.organization.name" value="Codehaus Plexus"/>
+  <property name="project.organization.url" value="http://codehaus-plexus.github.io"/>
+  
+  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
+  <property name="build.dir" value="target"/>
+  <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
+
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="${compiler.target}" 
+           verbose="false" 
+           fork="false" 
+           source="${compiler.source}">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+    </javac>
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}" 
+             packagenames="*" 
+             destdir="${reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             source="${compiler.source}"
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Bundle-Description" value="${project.description}"/>
+        <attribute name="Bundle-DocURL" value="${project.organization.url}"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="${project.name}"/>
+        <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.fragment}"/>
+        <attribute name="Bundle-Vendor" value="${project.organization.name}"/>
+        <attribute name="Bundle-Version" value="${project.version}"/>
+        <attribute name="Export-Package" value="org.codehaus.plexus.util;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.cli;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.cli.shell;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.dag;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.introspection;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.io;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.reflection;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.xml;version=&quot;${project.version}&quot;,org.codehaus.plexus.util.xml.pull;version=&quot;${project.version}&quot;"/>
+        <attribute name="Import-Package" value="org.codehaus.plexus.util,org.codehaus.plexus.util.cli.shell,org.codehaus.plexus.util.io,org.codehaus.plexus.util.reflection,org.codehaus.plexus.util.xml,org.codehaus.plexus.util.xml.pull"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <attribute name="JavaPackages-Version" value="${project.version}"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+      </manifest>
+     </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
diff --git a/plexus-utils.spec b/plexus-utils.spec
index 9843f40..c7ab941 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-utils
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,21 @@
 
 
 Name:           plexus-utils
-Version:        3.1.0
+Version:        3.1.1
 Release:        0
 Summary:        Plexus Common Utilities
-# ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/
-# xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
-# ASL 2.0 and BSD:
-#      src/main/java/org/codehaus/plexus/util/cli/StreamConsumer
-#      src/main/java/org/codehaus/plexus/util/cli/StreamPumper
-#      src/main/java/org/codehaus/plexus/util/cli/Commandline
-# Public domain: src/main/java/org/codehaus/plexus/util/TypeFormat.java
-# rest is ASL 2.0
-License:        Apache-1.1 AND Apache-2.0 AND xpp AND BSD AND SUSE-Public-Domain
+License:        Apache-1.1 AND Apache-2.0 AND xpp AND BSD-3-Clause AND SUSE-Public-Domain
 Group:          Development/Libraries/Java
 URL:            https://codehaus-plexus.github.io/plexus-utils/
 Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
-Source1:        http://apache.org/licenses/LICENSE-2.0.txt
+Source1:        %{name}-build.xml
+Source2:        http://apache.org/licenses/LICENSE-2.0.txt
 # https://github.com/codehaus-plexus/plexus-utils/issues/45
 Patch1:         0001-Follow-symlinks-in-NioFiles.copy.patch
-BuildRequires:  fdupes
-BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  fdupes ant
+BuildRequires:  javapackages-local
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+Requires:       mvn(org.codehaus.plexus:plexus:pom:)
 BuildArch:      noarch
 
 %description
@@ -51,6 +44,7 @@ is like a J2EE application server, without all the baggage.
 
 %package javadoc
 Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
 
 %description javadoc
 Javadoc for %{name}.
@@ -60,39 +54,30 @@ Javadoc for %{name}.
 
 %patch1 -p1
 
-cp %{SOURCE1} .
-
-%{mvn_file} : plexus/utils
-%{mvn_alias} : plexus:plexus-utils
-
-# Generate OSGI info
-%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
-%pom_xpath_inject "pom:build/pom:plugins" "
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <_nouses>true</_nouses>
-              <Export-Package>org.codehaus.plexus.util.*;org.codehaus.plexus.util.cli.*;org.codehaus.plexus.util.cli.shell.*;org.codehaus.plexus.util.dag.*;org.codehaus.plexus.util.introspection.*;org.codehaus.plexus.util.io.*;org.codehaus.plexus.util.reflection.*;org.codehaus.plexus.util.xml.*;org.codehaus.plexus.util.xml.pull.*</Export-Package>
-            </instructions>
-          </configuration>
-        </plugin>"
-
-%pom_remove_plugin :maven-enforcer-plugin
+cp %{SOURCE1} build.xml
+cp %{SOURCE2} .
 
 %build
-%{mvn_build} -f
+%ant jar javadoc
 
 %install
-%mvn_install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/plexus
+install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/utils.jar
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/utils.pom
+%add_maven_depmap plexus/utils.pom plexus/utils.jar -a plexus:plexus-utils
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
 %doc NOTICE.txt LICENSE-2.0.txt
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
 %doc NOTICE.txt LICENSE-2.0.txt
+%{_javadocdir}/%{name}
 
 %changelog