diff --git a/_service b/_service
index 088348d..a42f72c 100644
--- a/_service
+++ b/_service
@@ -4,6 +4,7 @@
     <param name="url">https://github.com/intel/ipmctl.git</param>
     <param name="filename">ipmctl</param>
     <param name="versionprefix">01.00.00.3394</param>
+    <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
     <param name="revision">master_1_0</param>
     <param name="exclude">.git</param>
     <param name="changesgenerate">enable</param>
diff --git a/ipmctl.changes b/ipmctl.changes
index 79dd6d4..7f19171 100644
--- a/ipmctl.changes
+++ b/ipmctl.changes
@@ -2,7 +2,7 @@
 Tue Jan 29 14:03:31 UTC 2019 - rw@suse.com
 
 - Update to v01.00.00.3402.
-  Sync with upstream release, no content changes.
+  Switch to release tarball, no content changes.
 - Improve spec-file.
 
 -------------------------------------------------------------------
diff --git a/ipmctl.spec b/ipmctl.spec
index 8c9461f..9ca0095 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -18,7 +18,7 @@
 
 %define abi     3
 #define vgit    .1547861714.b7a59da
-%define vgit    ""
+%define vgit    %{nil}
 %define vSafeC  03032018
 %define pSafeC  rurban/safeclib/releases/download/v%{vSafeC}
 %bcond_with     precompiledSafeC
@@ -30,18 +30,14 @@ Summary:        Utility for managing Intel Optane DC persistent memory modules
 License:        BSD-3-Clause
 Group:          System/Management
 Url:            https://github.com/intel/ipmctl
-%if %{vgit} == ""
+%if "%{vgit}" == ""
 Source:         https://github.com/intel/ipmctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %else
 Source:         %{name}-%{version}%{vgit}.tar.gz
 %endif
 Source1:        ChangeLog.xz
 Source2:        %{name}-rpmlintrc
-%if %{without precompiledSafeC}
 Source10:       https://github.com/%{pSafeC}/libsafec-%{vSafeC}.0-g570fa5.tar.gz
-%else
-Source10:       libsafec-prebuild.tar.xz
-%endif
 Source11:       mkSafeC
 Source12:       libsafec-patches.tar
 Patch1:         ipmctl-python3.patch
@@ -115,6 +111,10 @@ API for development of Intel Optane DC persistent memory management utilities.
 
 ! grep -lri 'INTEL CONFIDENTIAL' || exit 1
 
+%if %{with precompiledSafeC}
+  tar xfJ ../../SOURCES/libsafec-prebuild.tar.xz || sleep 5
+%endif
+
 %build
 /bin/bash -ex "%{SOURCE11}" "%{SOURCE12}" "%{?_smp_mflags}"
 export PKG_CONFIG_PATH=$PWD/contrib/lib/pkgconfig