diff --git a/50-kernel-uname_r.conf b/50-kernel-uname_r.conf
new file mode 100644
index 0000000..746d429
--- /dev/null
+++ b/50-kernel-uname_r.conf
@@ -0,0 +1,5 @@
+[Unit]
+RequiresMountsFor=/boot
+
+[Service]
+ExecStartPre=-/usr/lib/systemd/systemd-sysctl /boot/sysctl.conf-%v
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index eac7582..284c1d8 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 29 11:31:46 UTC 2016 - mmarek@suse.cz
+
+- Ignore failures when loading the kernel sysctl (bsc#977715).
+
+-------------------------------------------------------------------
+Thu Apr 28 20:15:31 UTC 2016 - mmarek@suse.com
+
+- Add a systemd service to load /boot/sysctl.conf-`uname -r`
+  (bsc#977715).
+
 -------------------------------------------------------------------
 Fri Apr  1 11:43:32 UTC 2016 - mmarek@suse.cz
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 875f0ec..f752939 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -45,6 +45,7 @@ Source9:        modsign-verify
 Source10:       kmp-install
 Source11:       macros.initrd
 Source12:       regenerate-initrd-posttrans
+Source13:       50-kernel-uname_r.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -94,6 +95,10 @@ install -d -m 755 "$b/usr/bin"
 install -pm 755 %_sourcedir/modsign-verify "$b/usr/bin/"
 install -pm 755 %_sourcedir/kmp-install "$b/usr/bin/"
 
+# systemd service to load /boot/sysctl.conf-`uname -r`
+install -d -m 755 "$b/usr/lib/systemd/system/systemd-sysctl.service.d"
+install -pm 755 %_sourcedir/50-kernel-uname_r.conf "$b/usr/lib/systemd/system/systemd-sysctl.service.d"
+
 %post
 test_allow_on_install()
 {
@@ -161,5 +166,6 @@ fi
 /usr/bin/kmp-install
 /usr/bin/modsign-verify
 /usr/lib/module-init-tools
+/usr/lib/systemd/system/systemd-sysctl.service.d
 
 %changelog