diff --git a/.gitignore b/.gitignore
index 02885e8..054d797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rdma-core-12.tgz
+/rdma-core-12.tar.gz
diff --git a/rdma-core.spec b/rdma-core.spec
index e1abbdd..397f34c 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 12
-Release: 0.1.rc3.1%{?dist}
+Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -9,11 +9,7 @@ Summary: RDMA core userspace libraries and daemons
 #  providers/hfi1verbs Uses the 3 Clause BSD license
 License: GPLv2 or BSD
 Url: https://github.com/linux-rdma/rdma-core
-# The initial release is due shortly, and in fact, an rc3 is now available:
-#   https://github.com/linux-rdma/rdma-core/archive/v12-rc3.tar.gz
-# However, to get the very latest, we're generating our own tarball for the moment:
-#   git archive --prefix rdma-core-12/ --output ~/rpmbuild/SOURCES/rdma-core-12.tgz HEAD
-Source: rdma-core-%{version}.tgz
+Source: https://github.com/linux-rdma/rdma-core/archive/%{name}-%{version}.tar.gz
 
 BuildRequires: binutils
 BuildRequires: cmake >= 2.8.11
@@ -212,7 +208,8 @@ In conjunction with the kernel ib_srp driver, srp_daemon allows you to
 discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
 
 %prep
-%setup
+# The release tarball is wonky, unpacks with rdma-core in name twice
+%setup -n %{name}-%{name}-%{version}
 
 %build
 
@@ -442,5 +439,8 @@ rm -rf %{buildroot}/%{_initrddir}/
 %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
 
 %changelog
+* Fri Jan 27 2017 Jarod Wilson <jarod@redhat.com> - 12-1
+- Update to upstream final v12 release
+
 * Wed Jan 25 2017 Jarod Wilson <jarod@redhat.com> - 12-0.1.rc3.1
 - Initial import to Fedora package database via post-v12-rc3 git snapshot
diff --git a/sources b/sources
index 1cce5be..43480fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rdma-core-12.tgz) = 4b376409ab5d0fa103646b42b0ef1d6441ade7de75a010f3659d0bd97582df4cdeac7d30d8edcde53f1b249e36a975f2a2781510342f7c894fe4bfbedd9b3450
+SHA512 (rdma-core-12.tar.gz) = f18c45cd9b4988677deab49f46425cd3150d56ee1b733bffe568132caccaaaa277180c249cf5f3268e59cf7b8125db5c43c2b8313c902a4d3b7ed3a75a87f295