diff --git a/systemtap-headers.changes b/systemtap-headers.changes
new file mode 100644
index 0000000..31eddd4
--- /dev/null
+++ b/systemtap-headers.changes
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Thu Feb  8 15:26:17 UTC 2018 - matz@suse.com
+
+- Created new specfile systemtap-headers.spec, so bootstrap cycles
+  packages can use them without blowing up the cycle.
+  [fate#324969]
diff --git a/systemtap-headers.spec b/systemtap-headers.spec
new file mode 100644
index 0000000..213c5a0
--- /dev/null
+++ b/systemtap-headers.spec
@@ -0,0 +1,61 @@
+#
+# spec file for package systemtap-headers
+#
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+Name:           systemtap-headers
+Version:        3.2
+Release:        0
+Summary:        SystemTap headers
+License:        GPL-2.0+
+Group:          Development/Tools/Debuggers
+Url:            http://sourceware.org/systemtap/
+Source0:        http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
+Source1:        http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc
+Source2:        systemtap.keyring
+Source3:        README-BEFORE-ADDING-PATCHES
+Source4:        README-KEYRING
+Source5:        stap-server.conf
+Patch1:         systemtap-build-source-dir.patch
+Patch2:         systemtap-change-extra_cflags-escape-processing.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+SystemTap is an instrumentation system for systems running Linux.
+This package contains the headers for static system probes.
+
+%prep
+%setup -q -n systemtap-%{version}
+%patch1 -p1
+%patch2 -p1
+
+%build
+# Our binutils always support '?' in the section characters on all
+# architectures, no need for configure tests
+sed -e 's/@support_section_question@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h
+
+%install
+mkdir -p %{buildroot}%{_includedir}/sys
+cp -rp includes/sys/*.h %{buildroot}%{_includedir}/sys/
+
+%files
+%defattr(-,root,root)
+%{_includedir}/sys/*.h
+
+%changelog
diff --git a/systemtap.changes b/systemtap.changes
index a54e163..7d62df0 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Feb  8 15:28:32 UTC 2018 - matz@suse.com
+
+- Don't include the headers files in sdt-devel
+- Add systemtap-headers to Requires of sdt-devel, so that it
+  provides the same files as before.  [fate#324969]
+
 -------------------------------------------------------------------
 Mon Nov 20 23:01:35 UTC 2017 - tonyj@suse.com
 
diff --git a/systemtap.spec b/systemtap.spec
index 348b831..99c5e28 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -85,6 +85,7 @@ This package contains the server component of systemtap.
 Summary:        Static probe support tools
 Group:          Development/Tools/Debuggers
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-headers = %{version}-%{release}
 
 %description sdt-devel
 SystemTap is an instrumentation system for systems running Linux.
@@ -111,6 +112,8 @@ rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request
 rm -rf %{buildroot}%{_docdir}/systemtap/
 rm -rf %{buildroot}%{_datadir}/systemtap/examples
 rm -rf %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/cs/man3
+# the headers come from systemtap-headers, a separate .spec file
+rm -rf %{buildroot}%{_includedir}/sys
 mkdir -p %{buildroot}%{_docdir}/systemtap/
 cp COPYING %{buildroot}%{_docdir}/systemtap/
 mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap
@@ -174,6 +177,5 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
 %files sdt-devel
 %defattr(-,root,root)
 %{_bindir}/dtrace
-%{_includedir}/sys/*.h
 
 %changelog