diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch
index fe41f2f..b9eceae 100644
--- a/fix-bnd-config.patch
+++ b/fix-bnd-config.patch
@@ -1,5 +1,5 @@
---- conf/mockito-core.bnd.orig	2012-09-04 15:08:36.953346883 +0200
-+++ conf/mockito-core.bnd	2012-09-04 15:09:49.221919598 +0200
+--- conf/mockito-core.bnd.orig	2012-09-06 14:42:08.417103606 +0200
++++ conf/mockito-core.bnd	2012-09-06 14:43:41.391834567 +0200
 @@ -1,8 +1,3 @@
 --classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \
 -            lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \
@@ -23,7 +23,7 @@
                  org.objenesis;version="[1.0,2.0)", \
 -                org.mockito.*
 +                org.mockito.*, \
-+                net.sf.cglib.proxy
++                net.sf.cglib*
  
  Private-Package: org.mockito.*
  
diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh
index 224d629..58c1b67 100644
--- a/make-mockito-sourcetarball.sh
+++ b/make-mockito-sourcetarball.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+#set -x
 
 VERSION=1.9.0
 SRCDIR=mockito-${VERSION}
diff --git a/mockito.spec b/mockito.spec
index df1b13b..5b4cb89 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
 Name:           mockito
 Version:        1.9.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A Java mocking framework
 
 License:        MIT
@@ -86,6 +86,11 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc NOTICE
 
 %changelog
+* Thu Sep 6 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.9.0-10
+- More Import-Package fixes. Note that fix-cglib-refs.patch is
+  not suitable for upstream:
+  http://code.google.com/p/mockito/issues/detail?id=373
+
 * Tue Sep 4 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.9.0-9
 - Fix missing Import-Package in manifest.
 
diff --git a/sources b/sources
index 3d148e8..f6b13f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c8f7d570579d7fbaa2a45fdeaf3e3e1  mockito-1.9.0.tar.xz
+967d7b4059fa8185b94d6f7273f6cfe5  mockito-1.9.0.tar.xz