diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..932a7fd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/tpm2-abrmd-1.1.0.tar.gz
diff --git a/.tpm2-abrmd.metadata b/.tpm2-abrmd.metadata
new file mode 100644
index 0000000..417d0ac
--- /dev/null
+++ b/.tpm2-abrmd.metadata
@@ -0,0 +1 @@
+05a06805c7a2c0892e280403bfacb33d37114764 SOURCES/tpm2-abrmd-1.1.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 98f42b4..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0001-tcti-tabrmd-Fix-NULL-deref-bug-by-moving-debug-outpu.patch b/SOURCES/0001-tcti-tabrmd-Fix-NULL-deref-bug-by-moving-debug-outpu.patch
new file mode 100644
index 0000000..d208e79
--- /dev/null
+++ b/SOURCES/0001-tcti-tabrmd-Fix-NULL-deref-bug-by-moving-debug-outpu.patch
@@ -0,0 +1,50 @@
+From 418d49669a33f9e6b029787e3869b3a534bb7de8 Mon Sep 17 00:00:00 2001
+From: Philip Tricca <philip.b.tricca@intel.com>
+Date: Mon, 14 Aug 2017 13:57:51 -0700
+Subject: [PATCH] tcti-tabrmd: Fix NULL deref bug by moving debug output after
+ NULL check.
+
+This one speaks for itself: The debug output dereferences the pointer to
+the context structure before checking for NULL. Switching these two
+things around fixes the issue.
+
+Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>
+---
+ src/tcti-tabrmd.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/tcti-tabrmd.c b/src/tcti-tabrmd.c
+index 970702c..134cf8d 100644
+--- a/src/tcti-tabrmd.c
++++ b/src/tcti-tabrmd.c
+@@ -293,11 +293,11 @@ tss2_tcti_tabrmd_cancel (TSS2_TCTI_CONTEXT *context)
+ GError *error = NULL;
+ gboolean cancel_ret;
+
+- g_info("tss2_tcti_tabrmd_cancel: id 0x%" PRIx64,
+- TSS2_TCTI_TABRMD_ID (context));
+ if (context == NULL) {
+ return TSS2_TCTI_RC_BAD_CONTEXT;
+ }
++ g_info("tss2_tcti_tabrmd_cancel: id 0x%" PRIx64,
++ TSS2_TCTI_TABRMD_ID (context));
+ if (TSS2_TCTI_TABRMD_STATE (context) != TABRMD_STATE_RECEIVE) {
+ return TSS2_TCTI_RC_BAD_SEQUENCE;
+ }
+@@ -346,11 +346,11 @@ tss2_tcti_tabrmd_set_locality (TSS2_TCTI_CONTEXT *context,
+ TSS2_RC ret = TSS2_RC_SUCCESS;
+ GError *error = NULL;
+
+- g_info ("tss2_tcti_tabrmd_set_locality: id 0x%" PRIx64,
+- TSS2_TCTI_TABRMD_ID (context));
+ if (context == NULL) {
+ return TSS2_TCTI_RC_BAD_CONTEXT;
+ }
++ g_info ("tss2_tcti_tabrmd_set_locality: id 0x%" PRIx64,
++ TSS2_TCTI_TABRMD_ID (context));
+ if (TSS2_TCTI_TABRMD_STATE (context) != TABRMD_STATE_TRANSMIT) {
+ return TSS2_TCTI_RC_BAD_SEQUENCE;
+ }
+--
+2.13.6
+
diff --git a/SOURCES/autoconf-fixup.patch b/SOURCES/autoconf-fixup.patch
new file mode 100644
index 0000000..9132478
--- /dev/null
+++ b/SOURCES/autoconf-fixup.patch
@@ -0,0 +1,10 @@
+diff -urN tpm2-abrmd-1.1.0/configure.ac tpm2-abrmd-1.1.0-new/configure.ac
+--- tpm2-abrmd-1.1.0/configure.ac 2017-07-01 12:39:29.000000000 -0700
++++ tpm2-abrmd-1.1.0-new/configure.ac 2017-12-14 14:04:04.768415662 -0700
+@@ -1,5 +1,4 @@
+-AC_INIT([tpm2-abrmd],
+- [m4_esyscmd_s([git describe --tags --always --dirty])])
++AC_INIT([tpm2-abrmd],[1.1.0])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CC
+ AC_PROG_LN_S
diff --git a/SPECS/tpm2-abrmd.spec b/SPECS/tpm2-abrmd.spec
new file mode 100644
index 0000000..0adf4a2
--- /dev/null
+++ b/SPECS/tpm2-abrmd.spec
@@ -0,0 +1,126 @@
+Name: tpm2-abrmd
+Version: 1.1.0
+Release: 8%{?dist}
+Summary: A system daemon implementing TPM2 Access Broker and Resource Manager
+
+License: BSD
+URL: https://github.com/01org/tpm2-abrmd
+Source0: https://github.com/01org/tpm2-abrmd/archive/%{version}/%{name}-%{version}.tar.gz
+# upstream commit 418d49669a33f9e6b029787e3869b3a534bb7de8
+Patch0: 0001-tcti-tabrmd-Fix-NULL-deref-bug-by-moving-debug-outpu.patch
+Patch1: autoconf-fixup.patch
+
+%{?systemd_requires}
+BuildRequires: systemd
+BuildRequires: libtool
+BuildRequires: autoconf-archive
+BuildRequires: pkgconfig(cmocka)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(sapi)
+BuildRequires: pkgconfig(tcti-device)
+BuildRequires: pkgconfig(tcti-socket)
+
+# this package does not support big endian arch so far,
+# and has been verified only on Intel platforms.
+ExclusiveArch: %{ix86} x86_64
+
+# tpm2-abrmd depends on tpm2-tss-devel for sapi/tcti-device/tcti-socket libs
+Requires: tpm2-tss-devel%{?_isa} >= 1.1.0-1%{?dist}
+
+%description
+tpm2-abrmd is a system daemon implementing the TPM2 access broker (TAB) and
+Resource Manager (RM) spec from the TCG.
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+autoreconf -vif
+
+%build
+%configure --disable-static --disable-silent-rules \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-udevrulesdir=%{_udevrulesdir}
+%make_build
+
+%install
+%make_install
+mv %{buildroot}/%{_udevrulesdir}/tpm-udev.rules %{buildroot}/%{_udevrulesdir}/60-tpm-udev.rules
+find %{buildroot}%{_libdir} -type f -name \*.la -delete
+
+%pre
+getent group tss >/dev/null || groupadd -g 59 -r tss
+getent passwd tss >/dev/null || \
+useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \
+ -c "Account used by tpm2-abrmd package to sandbox the tpm2-abrmd daemon" tss
+exit 0
+
+%files
+%doc README.md CHANGELOG.md
+%license LICENSE
+%{_libdir}/libtcti-tabrmd.so.*
+%{_sbindir}/tpm2-abrmd
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf
+%{_unitdir}/tpm2-abrmd.service
+%{_udevrulesdir}/60-tpm-udev.rules
+%{_mandir}/man3/tss2_tcti_tabrmd_init.3.gz
+%{_mandir}/man3/tss2_tcti_tabrmd_init_full.3.gz
+%{_mandir}/man7/tcti-tabrmd.7.gz
+%{_mandir}/man8/tpm2-abrmd.8.gz
+
+
+%package devel
+Summary: Headers, static libraries and package config files of tpm2-abrmd
+Requires: %{name}%{_isa} = %{version}-%{release}
+
+%description devel
+This package contains headers, static libraries and package config files
+required to build applications that use tpm2-abrmd.
+
+%files devel
+%{_includedir}/tcti/tcti-tabrmd.h
+%{_libdir}/libtcti-tabrmd.so
+%{_libdir}/pkgconfig/tcti-tabrmd.pc
+
+# on package installation
+%post
+/sbin/ldconfig
+%systemd_post tpm2-abrmd.service
+
+%preun
+%systemd_preun tpm2-abrmd.service
+
+%postun
+/sbin/ldconfig
+%systemd_postun tpm2-abrmd.service
+
+%changelog
+* Thu Dec 14 2017 Jerry Snitselaar <jsnitsel@redhat.com> - 1.1.0-8
+- Fix package version used by autoconf
+resolves: rhbz#1492466
+
+* Wed Oct 18 2017 Jerry Snitselaar <jsnitsel@redhat.com> - 1.1.0-7
+- tcti-abrmd: Fix null deref
+resolves: rhbz#1492466
+
+* Wed Oct 11 2017 Jerry Snitselaar <jsnitsel@redhat.com> - 1.1.0-6
+- Add scriptlet to add tss user if doesn't exist.
+resolves: rhbz#1492466
+
+* Wed Aug 16 2017 Sun Yunying <yunying.sun@intel.com> - 1.1.0-5
+- Updated source0 URL to fix rpmlint warnings
+
+* Tue Aug 15 2017 Sun Yunying <yunying.sun@intel.com> - 1.1.0-4
+- Rename and relocate udev rules file to _udevrulesdir
+- Update scriptlet to add service name after systemd_postrun
+
+* Tue Aug 1 2017 Sun Yunying <yunying.sun@intel.com> - 1.1.0-3
+- Use config option with-systemdsystemunitdir to set systemd unit file location
+
+* Mon Jul 31 2017 Sun Yunying <yunying.sun@intel.com> - 1.1.0-2
+- Removed BuildRequires for gcc
+- Move tpm2-abrmd systemd service to /usr/lib/systemd/system
+- Added scriptlet for tpm2-abrmd systemd service
+- Use autoreconf instead of bootstrap
+
+* Wed Jul 26 2017 Sun Yunying <yunying.sun@intel.com> - 1.1.0-1
+- Initial packaging