diff --git a/.gitignore b/.gitignore
index 4c236f9..223e0b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/tpm2-tools-3.0.3.tar.gz
+/tpm2-tools-3.0.4.tar.gz
diff --git a/sources b/sources
index 7ef7fcb..af1750d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tools-3.0.3.tar.gz) = 236e89afb5818dee93d1b687322af8c3a20f9390fd95ef3271ab857c6bacb68a67062efdf6de5796fcbc79153323ef56447bb351177df0ec435c390c40fc7ce0
+SHA512 (tpm2-tools-3.0.4.tar.gz) = e92535d2983a6781036179bf208b37215e23921e99d5a08c44766c1a4fe1e0991585297775c4ca69e8c6cefa6a5d32c9948dc9ac837607ca1c498f43a2d4f394
diff --git a/tpm2-tools.spec b/tpm2-tools.spec
index 9634667..57ee84a 100644
--- a/tpm2-tools.spec
+++ b/tpm2-tools.spec
@@ -1,11 +1,11 @@
 Name: tpm2-tools
-Version: 3.0.3
-Release: 3%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
 
 License: BSD
-URL:     https://github.com/intel/tpm2-tools
-Source0: https://github.com/intel/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
+URL:     https://github.com/tpm2-software/tpm2-tools
+Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -46,6 +46,10 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 %{_mandir}/man1/tpm2_*.1.gz
 
 %changelog
+* Mon Apr 30 2018 Javier Martinez Canillas <javierm@redhat.com> - 3.0.4-1
+- Update URLs to point to the new project location
+- Update to 3.0.4 release
+
 * Wed Feb 21 2018 Javier Martinez Canillas <javierm@redhat.com> - 3.0.3-3
 - Remove ExclusiveArch: x86_64 directive