diff --git a/i2c-tools.spec b/i2c-tools.spec
index 9e711bb..9102af8 100644
--- a/i2c-tools.spec
+++ b/i2c-tools.spec
@@ -49,6 +49,12 @@ Group:          Applications/System
 
 %description perl
 
+%package devel
+Summary:        Header files for i2c-tools
+
+%description devel
+%{summary}.
+
 %prep
 %setup -q
 
@@ -73,8 +79,8 @@ pushd py-smbus
 popd
 # cleanup
 rm -f $RPM_BUILD_ROOT%{_bindir}/decode-edid.pl
-# Remove userland kernel headers, belong in glibc-kernheaders.
-rm -rf $RPM_BUILD_ROOT%{_includedir}/linux
+# Move userland kernel headers to i2c-tools' own directory
+mv $RPM_BUILD_ROOT%{_includedir}/linux $RPM_BUILD_ROOT%{_includedir}/i2c-tools
 # Remove unpleasant DDC tools.  KMS already exposes the EDID block in sysfs,
 # and edid-decode is a more complete tool than decode-edid.
 rm -f $RPM_BUILD_ROOT%{_bindir}/{ddcmon,decode-edid}
@@ -130,6 +136,9 @@ exit 0
 %{_mandir}/man1/decode-*.1.gz
 %{_mandir}/man8/i2c-stub-from-dump.8.gz
 
+%files devel
+%{_includedir}/i2c-tools
+
 
 %changelog
 * Wed Jul 19 2017 Ondřej Lysoněk <olysonek@redhat.com> - 3.1.2-1