diff --git a/1095-set-ssd-disk-to-use-deadline-scheduler.patch b/1095-set-ssd-disk-to-use-deadline-scheduler.patch
new file mode 100644
index 00000000..39c4a74a
--- /dev/null
+++ b/1095-set-ssd-disk-to-use-deadline-scheduler.patch
@@ -0,0 +1,28 @@
+Index: systemd-210/Makefile.am
+===================================================================
+--- systemd-210.orig/Makefile.am
++++ systemd-210/Makefile.am
+@@ -2546,6 +2546,7 @@ dist_udevrules_DATA += \
+ 	rules/60-persistent-input.rules \
+ 	rules/60-persistent-alsa.rules \
+ 	rules/60-persistent-storage.rules \
++	rules/60-ssd-scheduler.rules \
+ 	rules/64-btrfs.rules \
+ 	rules/75-net-description.rules \
+ 	rules/75-tty-description.rules \
+Index: systemd-210/rules/60-ssd-scheduler.rules
+===================================================================
+--- /dev/null
++++ systemd-210/rules/60-ssd-scheduler.rules
+@@ -0,0 +1,11 @@
++# do not edit this file, it will be overwritten on update
++
++ACTION!="add", GOTO="ssd_scheduler_end"
++SUBSYSTEM!="block", GOTO="ssd_scheduler_end"
++
++IMPORT{cmdline}="elevator"
++ENV{elevator}=="*?", GOTO="ssd_scheduler_end"
++
++KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline"
++
++LABEL="ssd_scheduler_end"
diff --git a/systemd-mini.changes b/systemd-mini.changes
index c4d52872..62502738 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 13 09:54:35 UTC 2014 - rmilasan@suse.com
+
+- Create rule to set I/O scheduler to deadline if device attribute 
+  'rotational' equals 0, usually SSDs (bnc#904517).
+  Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch
+
 -------------------------------------------------------------------
 Mon Nov 10 12:39:35 UTC 2014 - werner@suse.de
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index 53523661..cc3d51fe 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1223,6 +1223,8 @@ Patch1092:      1092-libudev-do-not-accept-invalid-log-levels.patch
 Patch1093:      1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch
 # PATCH-FIX-UPSTREAM 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
 Patch1094:      1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
+# PATCH-FIX-SUSE 1095-set-ssd-disk-to-use-deadline-scheduler.patch (bnc#904517)
+Patch1095:      1095-set-ssd-disk-to-use-deadline-scheduler.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -2014,6 +2016,7 @@ cp %{SOURCE7} m4/
 %patch1092 -p0
 %patch1093 -p0
 %patch1094 -p0
+%patch1095 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+
diff --git a/systemd.changes b/systemd.changes
index c4d52872..62502738 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 13 09:54:35 UTC 2014 - rmilasan@suse.com
+
+- Create rule to set I/O scheduler to deadline if device attribute 
+  'rotational' equals 0, usually SSDs (bnc#904517).
+  Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch
+
 -------------------------------------------------------------------
 Mon Nov 10 12:39:35 UTC 2014 - werner@suse.de
 
diff --git a/systemd.spec b/systemd.spec
index cde2ec60..a06da517 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1218,6 +1218,8 @@ Patch1092:      1092-libudev-do-not-accept-invalid-log-levels.patch
 Patch1093:      1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch
 # PATCH-FIX-UPSTREAM 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
 Patch1094:      1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch
+# PATCH-FIX-SUSE 1095-set-ssd-disk-to-use-deadline-scheduler.patch (bnc#904517)
+Patch1095:      1095-set-ssd-disk-to-use-deadline-scheduler.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -2009,6 +2011,7 @@ cp %{SOURCE7} m4/
 %patch1092 -p0
 %patch1093 -p0
 %patch1094 -p0
+%patch1095 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+