diff --git a/cassandra-java-driver.spec b/cassandra-java-driver.spec
index 63d0d80..b3cdf3a 100644
--- a/cassandra-java-driver.spec
+++ b/cassandra-java-driver.spec
@@ -1,61 +1,61 @@
-Name:		cassandra-java-driver
-Version:	3.4.0
-Release:	1
-Summary:	DataStax Java Driver for Apache Cassandra
-License:	ASL 2.0
-URL:		https://github.com/datastax/java-driver
-Source0:	https://github.com/datastax/java-driver/archive/%{version}.tar.gz
+Name:                cassandra-java-driver
+Version:             3.4.0
+Release:             1
+Summary:             DataStax Java Driver for Apache Cassandra
+License:             ASL 2.0
+URL:                 https://github.com/datastax/java-driver
+Source0:             https://github.com/datastax/java-driver/archive/%{version}.tar.gz
 Patch0:              %{name}-%{version}-Remove-Guava-code-for-v18.patch
-BuildRequires:       	maven-local	mvn(io.dropwizard.metrics:metrics-core)
-BuildRequires:      	mvn(com.fasterxml.jackson.core:jackson-databind)	mvn(com.google.guava:guava)
-BuildRequires:      	mvn(io.netty:netty-handler)	mvn(io.netty:netty-transport-native-epoll)
-BuildRequires:      	mvn(javax.json:javax.json-api)	mvn(joda-time:joda-time)	mvn(log4j:log4j:1.2.17)
-BuildRequires:      	mvn(net.jpountz.lz4:lz4)	mvn(org.apache.commons:commons-exec)
-BuildRequires:      	mvn(org.assertj:assertj-core)	mvn(org.hdrhistogram:HdrHistogram)
-BuildRequires:      	mvn(org.mockito:mockito-all)	mvn(org.ow2.asm:asm-all)	mvn(org.slf4j:slf4j-api)
-BuildRequires:      	mvn(org.slf4j:slf4j-log4j12)	mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires:      	mvn(org.testng:testng)	mvn(org.xerial.snappy:snappy-java)
-BuildRequires:      	mvn(org.apache.felix:maven-bundle-plugin)	mvn(com.github.jnr:jnr-ffi)
-BuildRequires:      	mvn(com.github.jnr:jnr-posix)	mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:      	mvn(org.apache.maven.plugins:maven-failsafe-plugin)
-BuildRequires:      	mvn(org.apache.felix:org.apache.felix.framework)
-BuildRequires:      	mvn(ch.qos.logback:logback-classic)
-BuildArch:	noarch
+BuildRequires:       maven-local mvn(io.dropwizard.metrics:metrics-core)
+BuildRequires:       mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.google.guava:guava)
+BuildRequires:       mvn(io.netty:netty-handler) mvn(io.netty:netty-transport-native-epoll)
+BuildRequires:       mvn(javax.json:javax.json-api) mvn(joda-time:joda-time) mvn(log4j:log4j:1.2.17)
+BuildRequires:       mvn(net.jpountz.lz4:lz4) mvn(org.apache.commons:commons-exec)
+BuildRequires:       mvn(org.assertj:assertj-core) mvn(org.hdrhistogram:HdrHistogram)
+BuildRequires:       mvn(org.mockito:mockito-all) mvn(org.ow2.asm:asm-all) mvn(org.slf4j:slf4j-api)
+BuildRequires:       mvn(org.slf4j:slf4j-log4j12) mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires:       mvn(org.testng:testng) mvn(org.xerial.snappy:snappy-java)
+BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin) mvn(com.github.jnr:jnr-ffi)
+BuildRequires:       mvn(com.github.jnr:jnr-posix) mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-failsafe-plugin)
+BuildRequires:       mvn(org.apache.felix:org.apache.felix.framework)
+BuildRequires:       mvn(ch.qos.logback:logback-classic)
+BuildArch:           noarch
 %description
 A driver for Apache Cassandra 1.2+ that works exclusively with the
 Cassandra Query Language version 3 (CQL3) and Cassandra's binary protocol.
 
 %package extras
-Summary:	DataStax Java Driver for Apache Cassandra - Extras
-Requires:            	%{name} = %{version}-%{release}
+Summary:             DataStax Java Driver for Apache Cassandra - Extras
+Requires:            %{name} = %{version}-%{release}
 %description extras
 Extended functionality for the Java driver.
 
 %package mapping
-Summary:	DataStax Java Driver for Apache Cassandra - Object Mapping
-Requires:            	%{name} = %{version}-%{release}
+Summary:             DataStax Java Driver for Apache Cassandra - Object Mapping
+Requires:            %{name} = %{version}-%{release}
 %description mapping
 Object mapper for the DataStax CQL Java Driver.
 
 %package parent
-Summary:	DataStax Java Driver for Apache Cassandra - Parent POM
+Summary:             DataStax Java Driver for Apache Cassandra - Parent POM
 %description parent
 Parent POM for the DataStax Java Driver.
 
 %package tests
-Summary:	DataStax Java Driver for Apache Cassandra - Tests
-Requires:            	%{name} = %{version}-%{release}
+Summary:             DataStax Java Driver for Apache Cassandra - Tests
+Requires:            %{name} = %{version}-%{release}
 %description tests
 Tests for the DataStax Java Driver.
 
 %package javadoc
-Summary:	Javadoc for %{name}
+Summary:             Javadoc for %{name}
 %description javadoc
 This package contains javadoc for %{name}.
 
 %prep
 %setup -qn java-driver-%{version}
-%patch0 -p1
+patch0 -p1
 %pom_disable_module driver-dist
 %pom_disable_module driver-examples
 %pom_disable_module stress driver-tests
diff --git a/cassandra-java-driver.yaml b/cassandra-java-driver.yaml
index 4b77b69..41b07a6 100644
--- a/cassandra-java-driver.yaml
+++ b/cassandra-java-driver.yaml
@@ -1,5 +1,5 @@
-git_url: https://github.com/
+git_url: https://github.com/datastax/java-driver
 version_control: github
-src_repo: 
-tag_prefix: "^v"
+src_repo: datastax/java-driver
+tag_prefix: "^"
 seperator: "."