diff --git a/mongo-java-driver-gradle-local-fixes.patch b/mongo-java-driver-gradle-local-fixes.patch
index 50b2b62..bf662ea 100644
--- a/mongo-java-driver-gradle-local-fixes.patch
+++ b/mongo-java-driver-gradle-local-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/bson/build.gradle b/bson/build.gradle
-index 3afa8ae0e..4590df6d5 100644
+index 3afa8ae0e..aa8e6afa7 100644
 --- a/bson/build.gradle
 +++ b/bson/build.gradle
-@@ -16,16 +16,10 @@
+@@ -16,30 +16,19 @@
  
  apply plugin: 'osgi'
  apply plugin: 'java'
@@ -19,7 +19,10 @@ index 3afa8ae0e..4590df6d5 100644
  
  jar {
      manifest {
-@@ -36,10 +30,6 @@ jar {
+-        instruction 'Build-Version', getGitVersion()
+         instruction 'Import-Package',
+                     'javax.xml.bind.*',
+                     'org.slf4j;resolution:=optional'
      }
  }
  
@@ -243,10 +246,10 @@ index 2c67187b9..67aeb0d7d 100644
 -apply from: 'gradle/TestColorOutput.gradle'
 -
 diff --git a/driver-async/build.gradle b/driver-async/build.gradle
-index 8c38cb20b..221e02f36 100644
+index 8c38cb20b..f6ca17d19 100644
 --- a/driver-async/build.gradle
 +++ b/driver-async/build.gradle
-@@ -15,7 +15,6 @@
+@@ -15,13 +15,12 @@
   */
  
  apply plugin: 'osgi'
@@ -254,6 +257,13 @@ index 8c38cb20b..221e02f36 100644
  
  def configDir = new File(rootDir, 'config')
  archivesBaseName = 'mongodb-driver-async'
+ 
+ sourceSets {
+-    test.groovy.srcDirs += 'src/examples'
++    test.java.srcDirs += 'src/examples'
+ }
+ 
+ dependencies {
 @@ -32,12 +31,6 @@ dependencies {
      testCompile project(':driver-core').sourceSets.test.output
  }
@@ -267,7 +277,15 @@ index 8c38cb20b..221e02f36 100644
  tasks.withType(Checkstyle) {
      // needed so the Javadoc checks can find the code in other modules
      classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output)
-@@ -53,10 +46,6 @@ jar {
+@@ -45,7 +38,6 @@ tasks.withType(Checkstyle) {
+ 
+ jar {
+     manifest {
+-        instruction 'Build-Version', getGitVersion()
+         instruction 'Import-Package',
+                 'org.bson.*',
+                 'com.mongodb.*',
+@@ -53,10 +45,6 @@ jar {
      }
  }
  
@@ -335,10 +353,10 @@ index bf516508e..6db365b1b 100644
 +    main { java.srcDirs = ['src/main'] }
  }
 diff --git a/driver/build.gradle b/driver/build.gradle
-index 9b689bad0..fa3190b04 100644
+index 9b689bad0..473f4973b 100644
 --- a/driver/build.gradle
 +++ b/driver/build.gradle
-@@ -14,8 +14,6 @@
+@@ -14,13 +14,11 @@
   * limitations under the License.
   */
  
@@ -347,6 +365,12 @@ index 9b689bad0..fa3190b04 100644
  archivesBaseName = 'mongodb-driver'
  def configDir = new File(rootDir, 'config')
  
+ sourceSets {
+-    test.groovy.srcDirs += ['src/examples']
++    test.java.srcDirs += ['src/examples']
+ }
+ 
+ test {
 @@ -35,21 +33,12 @@ dependencies {
      testCompile project(':driver-core').sourceSets.test.output
  }
diff --git a/mongo-java-driver.spec b/mongo-java-driver.spec
index 6cdb07b..fbe92e6 100644
--- a/mongo-java-driver.spec
+++ b/mongo-java-driver.spec
@@ -19,15 +19,16 @@ Source0:	https://github.com/mongodb/%{pkg_name}/archive/r%{version}.tar.gz
 Patch0:         %{pkg_name}-gradle-local-fixes.patch
 
 %{!?scl:
-BuildRequires:	java-devel
+BuildRequires:  java-devel
 }
-BuildRequires:  %{?scl_prefix_java_common}gradle-local
-BuildRequires:  %{?scl_prefix_java_common}javapackages-tools
-BuildRequires:  %{?scl_prefix_java_common}javapackages-local
+BuildRequires:  gradle-local
+BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local
 BuildRequires:  mvn(io.netty:netty-buffer)
 BuildRequires:  mvn(io.netty:netty-transport)
 BuildRequires:  mvn(io.netty:netty-handler)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(org.xerial.snappy:snappy-java)
 
 
 %{!?scl: