diff --git a/.gitignore b/.gitignore
index 4021baf..4e5dd6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/vdo-6.1.0.149.tgz
+SOURCES/vdo-6a45c63.tar.gz
diff --git a/.vdo.metadata b/.vdo.metadata
index 12f72c2..880bffc 100644
--- a/.vdo.metadata
+++ b/.vdo.metadata
@@ -1 +1 @@
-a104b69c224502645321b173d4a0138d75c011bf SOURCES/vdo-6.1.0.149.tgz
+9dd00db2f680604b6d7a1e3f77ea8615430005ab SOURCES/vdo-6a45c63.tar.gz
diff --git a/SPECS/vdo.spec b/SPECS/vdo.spec
index 8c76c8d..da271df 100644
--- a/SPECS/vdo.spec
+++ b/SPECS/vdo.spec
@@ -1,15 +1,18 @@
-%define spec_release 16
+%global commit       6a45c632a0865b97dc67590ee5dd7cd6b261056c
+%global gittag       6.1.0.168
+%global shortcommit  %(c=%{commit}; echo ${c:0:7})
+%define spec_release 18
 #
 #
 #
 Summary: Management tools for Virtual Data Optimizer
 Name: vdo
-Version: 6.1.0.149
+Version: 6.1.0.168
 Release: %{spec_release}
 License: GPLv2
-Source: %{name}-%{version}.tgz
+Source0: https://github.com/dm-vdo/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 URL: http://github.com/dm-vdo/vdo
-Distribution: RHEL 7.3
+Distribution: RHEL 7.5
 Requires: PyYAML >= 3.10
 Requires: kmod-kvdo >= 6.1
 Requires: lvm2 >= 2.02.171
@@ -40,7 +43,7 @@ block-level deduplication, compression, and thin provisioning.
 This package provides the user-space management tools for VDO.
 
 %prep
-%setup -q
+%setup -n %{name}-%{commit}
 
 %build
 make
@@ -187,6 +190,15 @@ systemctl disable vdo.service || :
 
 
 %changelog
+* Sun Apr 29 2018 - Andy Walsh <awalsh@redhat.com> - 6.1.0.168-18
+- Bumped NVR for z-stream candidate
+
+* Sun Apr 29 2018 - Andy Walsh <awalsh@redhat.com> - 6.1.0.168-17
+- Updated source to use GitHub
+- Fixed bug where VDO would always be created with a dense index even when
+  a sparse index was requested.
+- Resolves: rhbz#1572496
+
 * Fri Feb 16 2018 - Joseph Chapman <jochapma@redhat.com> - 6.1.0.149-16
 - Sync mode is safe if underlying storage changes to requiring flushes
 - Resolves: rhbz#1540777