diff --git a/nvme-cli.spec b/nvme-cli.spec
index 833e2cb..c18e10e 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -2,8 +2,8 @@
 #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 Name:           nvme-cli
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        NVMe management command line interface
 
 License:        GPLv2+
@@ -24,10 +24,10 @@ nvme-cli provides NVM-Express user space tooling for Linux.
 
 %build
 
-# NB: the -I. part works around a bug fixed up stream by commit 254bcd6b2343
-# ("Fix CFLAGS parameter").  Rather than patching the fix in, I just added
-# an extra -I.  In the next release, we should be able to drop this hack.
-make PREFIX=/usr CFLAGS="%{optflags} -I." LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
+# CFLAGS on the command line breaks the build.  It works okay as an
+# environment variable, though.  See:
+# https://github.com/linux-nvme/nvme-cli/pull/480
+CFLAGS="%{optflags}" make PREFIX=/usr LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
 
 
 %install
@@ -46,6 +46,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvme
 
 
 %changelog
+* Mon Apr 15 2019 luto@kernel.org - 1.8.1-1
+- Update to 1.8.1-1.
+- Remove a build hack.
+
 * Sun Feb 24 2019 luto@kernel.org - 1.7-2
 - Create /etc/nvme
 
diff --git a/sources b/sources
index a13f71e..82594ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.7.tar.gz) = 777b3d894017a18f65ca98af6af9345090b60fe7be6a01591ca6be978b03337beb36377ec81d5c0b89272ec43467330872080b7b23549b6152ba8e02fb3393de
+SHA512 (v1.8.1.tar.gz) = b31690f6dbc1f88ebd461636b452b8dedc6e1f67e2fe9d088b1f1d2ddf634ab6ef8d628d2c7fdc6977587d9565deb816a1df8f4881759a12b030a190af5c9095