diff --git a/mt-st-1.1-mtio.patch b/mt-st-1.1-include.patch
similarity index 70%
rename from mt-st-1.1-mtio.patch
rename to mt-st-1.1-include.patch
index ce89704..678fdda 100644
--- a/mt-st-1.1-mtio.patch
+++ b/mt-st-1.1-include.patch
@@ -1,8 +1,10 @@
---- mt-st-1.1/mt.c.mtio	2008-08-04 08:24:45.000000000 +0200
-+++ mt-st-1.1/mt.c	2008-08-04 08:24:45.000000000 +0200
-@@ -23,7 +23,7 @@
+--- mt-st-1.1/mt.c.mtio	2018-05-29 08:26:16.874145539 +0200
++++ mt-st-1.1/mt.c	2018-05-29 08:32:03.940573221 +0200
+@@ -22,8 +22,9 @@
+ #include <sys/ioctl.h>
  #include <sys/stat.h>
  #include <sys/utsname.h>
++#include <sys/sysmacros.h>
  
 -#include "mtio.h"
 +#include <linux/mtio.h>
diff --git a/mt-st.spec b/mt-st.spec
index 0dce9e7..235f0ce 100644
--- a/mt-st.spec
+++ b/mt-st.spec
@@ -1,7 +1,7 @@
 Summary: Tool for controlling tape drives
 Name: mt-st
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL+
 Group: Applications/System
 URL: ftp://ftp.ibiblio.org/pub/linux/system/backup
@@ -11,7 +11,7 @@ Patch0: mt-st-1.1-redhat.patch
 Patch1: mt-st-1.1-SDLT.patch
 Patch2: mt-st-0.7-config-files.patch
 Patch3: mt-st-0.9b-manfix.patch
-Patch4: mt-st-1.1-mtio.patch
+Patch4: mt-st-1.1-include.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=948457
 Patch5: mt-st-1.1-options.patch
 Patch6: mt-st-1.1-man.patch
@@ -29,14 +29,7 @@ Install mt-st if you need a tool to  manage tape drives.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .sdlt
-%patch2 -p1 -b .configfiles
-%patch3 -p1 -b .manfix
-%patch4 -p1 -b .mtio
-%patch5 -p1 -b .options
-%patch6 -p1 -b .man
+%autosetup -p1
 
 # fix encoding
 f=README.stinit
@@ -46,7 +39,7 @@ mv $f.new $f
 
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="%{build_cflags} %{build_ldflags}"
 
 
 %install
@@ -73,6 +66,9 @@ install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/stinit.service
 
 
 %changelog
+* Tue May 29 2018 Dan Horák <dan[at]danny.cz> - 1.1-22
+- fix includes (#1583414)
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild