diff --git a/.gitignore b/.gitignore
index b5e72d6..63cc790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /bcel-5.2-src.tar.gz
 /bcel-1592769.tar.xz
+/bcel-6.1-src.tar.gz
diff --git a/bcel.spec b/bcel.spec
index bc3c929..fa4bcb5 100644
--- a/bcel.spec
+++ b/bcel.spec
@@ -1,25 +1,20 @@
-%global svnrev 1592769
-
 Name:           bcel
-Version:        6.0
-Release:        0.7.20140406svn%{svnrev}%{?dist}
+Version:        6.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
 URL:            http://commons.apache.org/proper/commons-bcel/
-# Source for releases:
-# Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz
-
-# svn export http://svn.apache.org/repos/asf/commons/proper/bcel/trunk bcel
-# tar cJf bcel-1592769.tar.xz bcel
-Source0:        bcel-%{svnrev}.tar.xz
-# Upstream uses Maven 1, which is not available in Fedora.
-# The following is upstream project.xml converted to Maven 2/3.
-Source1:        %{name}-pom.xml
+Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz
+
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(regexp:regexp)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(net.java.dev.jna:jna)
+BuildRequires:  mvn(net.java.dev.jna:jna-platform)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 
 %description
@@ -40,14 +35,26 @@ being the Xalan XSLT processor at Apache.
 
 %package javadoc
 Summary:        API documentation for %{name}
-Obsoletes:      %{name}-manual < %{version}-%{release}
 
 %description javadoc
 This package provides %{summary}.
 
 %prep
-%setup -q -n %{name}
-cp -p %{SOURCE1} pom.xml
+%setup -q -n %{name}-%{version}-src
+
+%pom_remove_plugin :maven-source-plugin
+
+%pom_xpath_set /pom:project/pom:packaging bundle
+%pom_add_plugin org.apache.felix:maven-bundle-plugin '
+<extensions>true</extensions>
+<configuration>
+  <instructions>
+    <_nouses>true</_nouses>
+    <Export-Package>org.apache.bcel.*</Export-Package>
+  </instructions>
+</configuration>
+'
+
 %mvn_alias : bcel: apache:
 %mvn_file : %{name}
 
@@ -62,13 +69,16 @@ sed -i '\|lib/dt\.jar|s|javaHome|javaHome.substring(0, javaHome.length() - 4)|' 
 %mvn_install
 
 %files -f .mfiles
-%doc README.txt
-%doc LICENSE.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Sep 19 2017 Michael Simacek <msimacek@redhat.com> - 0:6.1-1
+- Update to upstream version 6.1
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:6.0-0.7.20140406svn1592769
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ce4687..ebacac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ad6d683fa3f6fb611673bbaf1f34c1a  bcel-1592769.tar.xz
+SHA512 (bcel-6.1-src.tar.gz) = 6a0957d4a46a8caed5f39719691c23c30246a16ee5ea71ceb2436d2b5be6bdf3d70418be1a232673814f8e11eae0438b9a97e1fda4a389b47025c36210637e36