diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index 22a7ae16..423e0ced 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-version = '1.0'
+version = '2.0.0'
 
 repositories {
 	mavenCentral()
diff --git a/tools/tcg_rim_tool/scripts/rimtool.sh b/tools/tcg_rim_tool/scripts/rimtool.sh
index 30e731c1..8b0fc5b1 100644
--- a/tools/tcg_rim_tool/scripts/rimtool.sh
+++ b/tools/tcg_rim_tool/scripts/rimtool.sh
@@ -3,6 +3,6 @@
 # Calls the the_tcg_rim_tool and passes in parameters
 scriptDir=$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")
 baseDir=${scriptDir%/*}
-jar="tcg_rim_tool-1.0.jar";
+jar="tcg_rim_tool-2.0.0.jar";
 java -jar $baseDir/$jar "$@"
 
diff --git a/tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java b/tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java
index 93883d67..554f3ca5 100644
--- a/tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java
+++ b/tools/tcg_rim_tool/src/test/java/hirs/swid/TestSwidTagGateway.java
@@ -54,7 +54,7 @@ public class TestSwidTagGateway {
 		gateway.setPemCertificateFile(SIGNING_CERT_FILE);
 		gateway.setPemPrivateKeyFile(PRIVATE_KEY_FILE);
 		gateway.generateSwidTag(DEFAULT_OUTPUT);
-		expectedFile = (InputStream) TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_WITH_CERT);
+		expectedFile = TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_WITH_CERT);
 		Assert.assertTrue(compareFileBytesToExpectedFile(DEFAULT_OUTPUT));
 	}
 
@@ -67,7 +67,7 @@ public class TestSwidTagGateway {
 		gateway.setDefaultCredentials(true);
 		gateway.setJksKeystoreFile(JKS_KEYSTORE_FILE);
 		gateway.generateSwidTag(DEFAULT_OUTPUT);
-		expectedFile = (InputStream) TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_NO_CERT);
+		expectedFile = TestSwidTagGateway.class.getClassLoader().getResourceAsStream(DEFAULT_NO_CERT);
 		Assert.assertTrue(compareFileBytesToExpectedFile(DEFAULT_OUTPUT));
 	}
 
diff --git a/tools/tcg_rim_tool/tcg_rim_tool.spec b/tools/tcg_rim_tool/tcg_rim_tool.spec
index 84230204..ed6f5a0d 100644
--- a/tools/tcg_rim_tool/tcg_rim_tool.spec
+++ b/tools/tcg_rim_tool/tcg_rim_tool.spec
@@ -1,5 +1,5 @@
 Name:           tcg_rim_tool
-Version:        1.0
+Version:        2.0.0
 Release:        1%{?dist}
 Summary:        A java command-line tool to create PC client root RIM
 
@@ -23,7 +23,7 @@ rm -f /opt/hirs/rimtool/%{name}*.jar
 
 %install
 mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin
-cp build/libs/%{name}-%{version}.jar %{buildroot}/opt/hirs/rimtool/
+cp build/libs/tools/%{name}-%{version}.jar %{buildroot}/opt/hirs/rimtool/
 cp ./rim_fields.json %{buildroot}/opt/hirs/rimtool/
 cp ./keystore.jks %{buildroot}/opt/hirs/rimtool/
 cp -r ./scripts/ %{buildroot}/opt/hirs/rimtool/
@@ -39,6 +39,8 @@ ln -sf /opt/hirs/rimtool/scripts/rimtool.sh %{buildroot}/usr/local/bin/rim
 %attr(755, root, root) /opt/hirs/rimtool/scripts/rimtool.sh
 
 %changelog
+* Tue Nov 10 2020 chubtub
+- Second release
 * Mon Jun 15 2020 chubtub
 - First release
 * Mon Jan 6 2020 chubtub