diff --git a/build.gradle b/build.gradle
index 307bfaba4c..051791841b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -455,7 +455,7 @@ subprojects { subProject ->
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Publishing
-	if ( !subProject.name.equals( 'documentation' ) || !subProject.name.equals( 'hibernate-infinispan' ) ) {
+	if ( !subProject.name.equals( 'documentation' ) && !subProject.name.equals( 'hibernate-infinispan' ) ) {
 		// do not configure publishing for the documentation module
 		publishing {
 			publications {
diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle
index 360e10d89a..c7e219ab6d 100644
--- a/hibernate-infinispan/hibernate-infinispan.gradle
+++ b/hibernate-infinispan/hibernate-infinispan.gradle
@@ -10,21 +10,23 @@ mavenPom {
 	description = '(deprecated - use org.infinispan:infinispan-hibernate-cache instead) Integration for Infinispan into Hibernate as a second-level caching service'
 }
 
-def osgiDescription() {
-	return mavenPom.description
-}
+jar.enabled = false
 
-jar {
-	// The OSGi JAR manifest support does not like a non-existent classes dir,
-	// so make sure we dont use the OSGi one :)
-	manifest = null
-}
-
-sourcesJar {
-	// The OSGi JAR manifest support does not like a non-existent classes dir,
-	// so make sure we dont use the OSGi one :)
-	manifest = null
-}
+//def osgiDescription() {
+//	return mavenPom.description
+//}
+//
+//jar {
+//	// The OSGi JAR manifest support does not like a non-existent classes dir,
+//	// so make sure we dont use the OSGi one :)
+//	manifest = null
+//}
+//
+//sourcesJar {
+//	// The OSGi JAR manifest support does not like a non-existent classes dir,
+//	// so make sure we dont use the OSGi one :)
+//	manifest = null
+//}
 
 def relocatedGroupId  = 'org.infinispan'
 def relocatedArtifactId  = 'infinispan-hibernate-cache'
diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index 4b31f9c785..d48b7387d9 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -238,7 +238,10 @@ karafFeatures {
 			name = 'hibernate-infinispan'
 			description = 'Feature for easily adding Infinispan-based caching support to hibernate-orm'
 			dependencyFeatureNames = ['hibernate-orm']
-			projects = [rootProject.childProjects.'hibernate-infinispan']
+			bundle {
+				match group: 'org.infinispan', module: 'infinispan-hibernate-cache'
+				include = true
+			}
 			bundle {
 				match group: 'org.hibernate', module: 'hibernate-core'
 				include = false