diff --git a/sg3_utils-58-scsi-sg3_symlink-fixup.patch b/sg3_utils-58-scsi-sg3_symlink-fixup.patch
new file mode 100644
index 0000000..36b1ed2
--- /dev/null
+++ b/sg3_utils-58-scsi-sg3_symlink-fixup.patch
@@ -0,0 +1,12 @@
+--- sg3_utils-1.41-orig/scripts/58-scsi-sg3_symlink.rules	2014-12-21 01:42:18.000000000 +0100
++++ sg3_utils-1.41/scripts/58-scsi-sg3_symlink.rules	2015-10-05 12:26:23.774532127 +0200
+@@ -14,8 +14,7 @@
+ # NAA identifier (prefix 3)
+ # 1: IEEE Registered Extended first
+ ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}"
+-ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition",
+-# SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
++ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
+ # 2: IEEE Registered
+ ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}"
+ ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}-part%n"
diff --git a/sg3_utils.changes b/sg3_utils.changes
index 36e05d8..44ea925 100644
--- a/sg3_utils.changes
+++ b/sg3_utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  5 10:31:04 UTC 2015 - zaitor@opensuse.org
+
+- Add sg3_utils-58-scsi-sg3_symlink-fixup.patch: Fix broken line in
+  script (boo#940833, boo#940834, boo#947947).
+
 -------------------------------------------------------------------
 Wed Jul  8 07:35:53 UTC 2015 - jthumshirn@suse.com
 
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 5b3214e..9a0bceb 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -28,6 +28,8 @@ Url:            http://sg.danny.cz/sg/sg3_utils.html
 Source:         http://sg.danny.cz/sg/p/%name-%version.tar.xz
 Patch1:         sgut-libversioning.diff
 Patch3:         sg3_utils-sg_inq-blacklist.diff
+# PATCH-FIX-UPSTREAM sg3_utils-58-scsi-sg3_symlink-fixup.patch boo#940833 boo#940834 boo#947947 zaitor@opensuse.org -- Fix broken line in script
+Patch4:         sg3_utils-58-scsi-sg3_symlink-fixup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libtool
 BuildRequires:  udev
@@ -85,6 +87,7 @@ applications that want to make use of libsgutils.
 %setup -q
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fi