diff --git a/less-fix_crash_in_hilite_line.patch b/less-fix_crash_in_hilite_line.patch
new file mode 100644
index 0000000..89b9e6f
--- /dev/null
+++ b/less-fix_crash_in_hilite_line.patch
@@ -0,0 +1,12 @@
+Index: less-458/pattern.c
+===================================================================
+--- less-458.orig/pattern.c	2013-04-04 18:55:06.000000000 +0200
++++ less-458/pattern.c	2015-06-25 11:06:56.681087046 +0200
+@@ -277,6 +277,7 @@ match_pattern(pattern, tpattern, line, l
+ 	struct regexp *spattern = (struct regexp *) pattern;
+ #endif
+ 
++	*sp = *ep = NULL;
+ #if NO_REGEX
+ 	search_type |= SRCH_NO_REGEX;
+ #endif
diff --git a/less.changes b/less.changes
index 882191f..73c7a49 100644
--- a/less.changes
+++ b/less.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 25 09:17:17 UTC 2015 - vcizek@suse.com
+
+- fix a crash in hilite_line (boo#915387)
+  * added less-fix_crash_in_hilite_line.patch 
+
 -------------------------------------------------------------------
 Fri Mar 13 16:10:30 UTC 2015 - kstreitova@suse.com
 
diff --git a/less.spec b/less.spec
index 2969606..2c3c92e 100644
--- a/less.spec
+++ b/less.spec
@@ -36,6 +36,8 @@ Patch27:        %{name}-429-save_line_position.patch
 Patch28:        %{name}-429-more.patch
 # PATCH-FIX-UPSTREAM bnc#921719 kstreitova@suse.com -- security fix of an out of bound read access in the UTF-8
 Patch29:        less-458-out_of_bounds_read.patch
+# PATCH-FIX-UPSTREAM fix crash in nomatch search
+Patch30:        less-fix_crash_in_hilite_line.patch
 BuildRequires:  automake
 BuildRequires:  ncurses-devel
 Requires:       file
@@ -56,6 +58,7 @@ start an editor at any time from within less.
 %patch27
 %patch28
 %patch29 -p1
+%patch30 -p1
 #
 # the ./configure script is not writable for the normal user
 # rather fix permissions for all files