diff --git a/.gitignore b/.gitignore
index 3d41d2c..47514da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xbean-3.7.tar.xz
 /xbean-3.11.1.tar.xz
 /xbean-3.13-source-release.zip
 /xbean-3.16-source-release.zip
+/xbean-3.17-source-release.zip
diff --git a/sources b/sources
index 83314a7..94d743b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b63160673fa34c87068f2f6f78551b8  xbean-3.16-source-release.zip
+5b30546ef2478d31c787079072bf9def  xbean-3.17-source-release.zip
diff --git a/xbean-asm4-unshade.patch b/xbean-asm4-unshade.patch
index 82037ed..70ca3f6 100644
--- a/xbean-asm4-unshade.patch
+++ b/xbean-asm4-unshade.patch
@@ -1,15 +1,15 @@
---- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~	2013-11-13 22:39:12.000000000 +0100
-+++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java	2013-12-05 13:46:32.916772376 +0100
+--- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~	2014-04-14 13:00:42.025851035 +0200
++++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java	2014-04-14 13:01:13.794418041 +0200
 @@ -17,12 +17,12 @@
   */
  package org.apache.xbean.recipe;
  
--import org.apache.xbean.asm4.ClassReader;
--import org.apache.xbean.asm4.Label;
--import org.apache.xbean.asm4.MethodVisitor;
--import org.apache.xbean.asm4.Opcodes;
--import org.apache.xbean.asm4.Type;
--import org.apache.xbean.asm4.shade.commons.EmptyVisitor;
+-import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
+-import org.apache.xbean.asm5.ClassReader;
+-import org.apache.xbean.asm5.Label;
+-import org.apache.xbean.asm5.MethodVisitor;
+-import org.apache.xbean.asm5.Opcodes;
+-import org.apache.xbean.asm5.Type;
 +import org.objectweb.asm.ClassReader;
 +import org.objectweb.asm.ClassVisitor;
 +import org.objectweb.asm.Label;
diff --git a/xbean.spec b/xbean.spec
index d6a9076..1272d8c 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           xbean
-Version:        3.16
+Version:        3.17
 BuildArch:      noarch
 
 Release:        1%{?dist}
@@ -117,11 +117,10 @@ rm src/site/site.xml
 
 %pom_remove_parent
 %pom_remove_dep mx4j:mx4j
-%pom_remove_dep :xbean-asm4-shaded xbean-reflect
+%pom_remove_dep :xbean-asm5-shaded xbean-reflect
 
 # These aren't needed for now
-%pom_disable_module xbean-asm-shaded
-%pom_disable_module xbean-asm4-shaded
+%pom_disable_module xbean-asm5-shaded
 %pom_disable_module xbean-finder-shaded
 %pom_disable_module xbean-telnet
 
@@ -195,6 +194,9 @@ find -name pom.xml -exec sed -i "s|<artifactId>cglib-nodep</artifactId>|<artifac
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Apr 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.17-1
+- Update to upstream version 3.17
+
 * Thu Dec  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.16-1
 - Update to upstream version 3.16