diff --git a/xfsprogs.changes b/xfsprogs.changes
index ddc091d..5fe60b6 100644
--- a/xfsprogs.changes
+++ b/xfsprogs.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Apr 19 20:46:25 UTC 2018 - lurodriguez@suse.com
+
+- Fix SLE15 build (bsc#1090290) due to systemd. Systemd is present since
+  OpenSUSE Leap 42.1 and SLE12-SP1, so we need to ensure the build
+  has systemd available on these release. We also then need to indicate
+  the new files installed when on systemd. So this fixes the build issue
+  on SLE15 and also makes available the systemd service unit files now
+  on all releases which support systemd.
+
+-------------------------------------------------------------------
+Tue Apr 17 21:02:42 UTC 2018 - olaf@aepfle.de
+
+- xfsprogs-devel needs uuid/uuid.h, Require pkgconfig(uuid) (bsc#1089947)
+
 -------------------------------------------------------------------
 Wed Mar  7 19:51:21 UTC 2018 - lurodriguez@suse.com
 
diff --git a/xfsprogs.spec b/xfsprogs.spec
index c52d7a0..faba5bb 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -48,7 +48,11 @@ BuildRequires:  suse-module-tools
 %endif
 BuildRequires:  xz
 Requires(post): coreutils
-
+# Starting with OpenSUSE Leap 42.1 and SLE12-SP1 we get systemd
+%if 0%{?sle_version} >= 120100
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(systemd)
+%endif
 %description
 A set of commands to use the XFS file system, including mkfs.xfs.
 
@@ -67,6 +71,7 @@ IRIX version of XFS.
 Summary:        XFS Filesystem-specific Static Libraries and Headers
 Group:          Development/Libraries/C and C++
 Requires:       xfsprogs = %{version}
+Requires:       pkgconfig(uuid)
 
 %description devel
 xfsprogs-devel contains the libraries and header files needed to
@@ -90,7 +95,10 @@ autoconf
 export OPTIMIZER="-fPIC"
 export DEBUG=-DNDEBUG
 export LIBUUID=%{_libdir}/libuuid.a
-%configure --enable-readline=yes
+%if 0%{?sle_version} >= 120100
+export USE_SYSTEMD="--with-systemd-unit-dir=%{_unitdir}"
+%endif
+%configure --enable-readline=yes $USE_SYSTEMD
 make %{?_smp_mflags} V=1
 
 PATH_TO_HELP="%{_dracutmodulesdir}/95suse-xfs/dracut-fsck-help.txt"
@@ -137,6 +145,13 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
 %{_libdir}/libhandle.so.*
 %dir %{_libdir}/xfsprogs/
 %{_libdir}/xfsprogs/xfs_scrub_all.cron
+%if 0%{?sle_version} >= 120100
+%{_libdir}/xfsprogs/xfs_scrub_fail
+%{_unitdir}/xfs_scrub@.service
+%{_unitdir}/xfs_scrub_all.service
+%{_unitdir}/xfs_scrub_all.timer
+%{_unitdir}/xfs_scrub_fail@.service
+%endif
 %doc %{_mandir}/man[258]/*
 %doc %{_defaultdocdir}/%{name}
 %dir %{_libexecdir}/dracut