diff --git a/.gitignore b/.gitignore
index 39a2070..7ac990c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tpm2-tss-1.3.0.tar.gz
+SOURCES/tpm2-tss-1.4.0.tar.gz
diff --git a/.tpm2-tss.metadata b/.tpm2-tss.metadata
index 23246df..0b9b7bb 100644
--- a/.tpm2-tss.metadata
+++ b/.tpm2-tss.metadata
@@ -1 +1 @@
-5b72beeaadf36571b41fd7a96d1a895c6205615b SOURCES/tpm2-tss-1.3.0.tar.gz
+efd1a97cd61df89af1a1f6f252cdba29fe7726ba SOURCES/tpm2-tss-1.4.0.tar.gz
diff --git a/SOURCES/60-tpm-udev.rules b/SOURCES/60-tpm-udev.rules
new file mode 100644
index 0000000..bdcd38a
--- /dev/null
+++ b/SOURCES/60-tpm-udev.rules
@@ -0,0 +1,2 @@
+# tpm2 devices can be accessed by the tss user or tss group members
+KERNEL=="tpmrm[0-9]*|tpm[0-9]*", MODE="0660", OWNER="tss", GROUP="tss"
diff --git a/SOURCES/autoconf-fixup.patch b/SOURCES/autoconf-fixup.patch
index 14a957b..694304d 100644
--- a/SOURCES/autoconf-fixup.patch
+++ b/SOURCES/autoconf-fixup.patch
@@ -1,10 +1,23 @@
-diff -urN tpm2-tss-1.3.0/configure.ac tpm2-tss-1.3.0-new/configure.ac
---- tpm2-tss-1.3.0/configure.ac	2017-12-07 18:02:44.000000000 -0700
-+++ tpm2-tss-1.3.0-new/configure.ac	2017-12-14 13:33:53.164624755 -0700
-@@ -1,5 +1,4 @@
--AC_INIT([tpm2-tss],
--        [m4_esyscmd_s([git describe --tags --always --dirty])])
-+AC_INIT([tpm2-tss],[1.3.0])
+diff -ur tpm2-tss-1.4.0/bootstrap tpm2-tss-1.4.0-new/bootstrap
+--- tpm2-tss-1.4.0/bootstrap	2018-03-02 17:15:33.000000000 -0700
++++ tpm2-tss-1.4.0-new/bootstrap	2018-06-15 17:46:09.072306885 -0700
+@@ -1,9 +1,6 @@
+ #!/bin/sh
+ set -e
+ 
+-# put version string into file used @ configure time, see AC_INIT
+-git describe --tags --always --dirty > VERSION
+-
+ # generate list of source files for use in Makefile.am
+ # if you add new source files, you must run ./bootstrap again
+ src_listvar () {
+diff -ur tpm2-tss-1.4.0/configure.ac tpm2-tss-1.4.0-new/configure.ac
+--- tpm2-tss-1.4.0/configure.ac	2018-03-02 17:15:33.000000000 -0700
++++ tpm2-tss-1.4.0-new/configure.ac	2018-06-15 17:46:23.667101384 -0700
+@@ -1,5 +1,5 @@
+ AC_INIT([tpm2-tss],
+-        [m4_esyscmd_s([cat VERSION])])
++        [1.4.0])
  AC_CONFIG_MACRO_DIR([m4])
  AC_PROG_CC
  AC_PROG_CXX
diff --git a/SPECS/tpm2-tss.spec b/SPECS/tpm2-tss.spec
index 574ae59..6715bb0 100755
--- a/SPECS/tpm2-tss.spec
+++ b/SPECS/tpm2-tss.spec
@@ -1,15 +1,16 @@
 Name:           tpm2-tss
-Version:        1.3.0
+Version:        1.4.0
 Release:        2%{?dist}
 Summary:        TPM2.0 Software Stack
 
 # The entire source code is under BSD except implementation.h and tpmb.h which
 # is under TCGL(Trusted Computing Group License).
 License:        BSD and TCGL
-URL:            https://github.com/01org/tpm2-tss
-Source0:        https://github.com/01org/tpm2-tss/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL:            https://github.com/tpm2-software/tpm2-tss
+Source0:        https://github.com/tpm2-software/tpm2-tss/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        60-tpm-udev.rules
 
-Patch0: autoconf-fixup.patch
+Patch0:         autoconf-fixup.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -18,6 +19,8 @@ BuildRequires:  libtool
 BuildRequires:  pkgconfig
 
 Obsoletes:  %{name}-utils <= 1.1.0-1
+# udev rules moved from tpm2-abrmd package
+Conflicts:  tpm2-abrmd%{?_isa} <= 1.1.0-8%{?dist}
 
 # this package does not support big endian arch so far,
 # and has been verified only on Intel platforms.
@@ -34,21 +37,26 @@ APIs for applications to access TPM module through kernel TPM drivers.
 
 
 %build
-%configure  --disable-static --disable-silent-rules
+%configure --disable-static --disable-silent-rules
 %make_build
 
 %install
 %make_install
 find %{buildroot}%{_libdir} -type f -name \*.la -delete
 
+mkdir -p %{buildroot}%{_udevrulesdir}
+install -m 0644 -D -t %{buildroot}/%{_udevrulesdir}/ %{SOURCE1}
+
 %clean
 rm -rf %{buildroot}
 
 %files
+%doc README.md CHANGELOG.md
 %license LICENSE
 %{_libdir}/libsapi.so.*
 %{_libdir}/libtcti-device.so.*
 %{_libdir}/libtcti-socket.so.*
+%{_udevrulesdir}/60-tpm-udev.rules
 
 %package        devel
 Summary:        Headers and libraries for building apps that use tpm2-tss 
@@ -75,6 +83,14 @@ use tpm2-tss.
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 06 2018 Jerry Snitselaar <jsnitsel@redhat.com> - 1.4.0-2
+- Add conflict for older tpm2-abrmd versions due to udev rules move.
+resolves: rhbz#1626069
+
+* Fri Jun 15 2018 Jerry Snitselaar <jsnitsel@redhat.com> - 1.4.0-1
+- Rebase to 1.4.0 release
+resolves: rhbz#1515116
+
 * Thu Dec 14 2017 Jerry Snitselaar <jsnitsel@redhat.com> - 1.3.0-2
 - Fix package version in autoconf
 resolves: rhbz#1463097