diff --git a/less-406-more.patch b/less-406-more.patch
new file mode 100644
index 0000000..1733347
--- /dev/null
+++ b/less-406-more.patch
@@ -0,0 +1,13 @@
+--- option.c
++++ option.c
+@@ -134,6 +134,10 @@
+ 			s--;
+ 			optc = 'z';
+ 			break;
++		case 'l':
++			if (less_is_more)
++				continue;
++			break;
+ 		case 'n':
+ 			if (less_is_more)
+ 				optc = 'z';
diff --git a/less.changes b/less.changes
index 5781d4e..78d997a 100644
--- a/less.changes
+++ b/less.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 12 13:44:01 CEST 2007 - anosek@suse.cz
+
+- fixed Less -l option conflicts with more -l [#307796] (more.patch)
+
 -------------------------------------------------------------------
 Fri Aug 17 10:23:08 CEST 2007 - anosek@suse.cz
 
diff --git a/less.spec b/less.spec
index eb17e7a..99e9406 100644
--- a/less.spec
+++ b/less.spec
@@ -21,7 +21,7 @@ Provides:       normal-less jless
 Requires:       file
 Autoreqprov:    on
 Version:        406
-Release:        7
+Release:        12
 Summary:        Text File Browser and Pager Similar to more
 URL:            http://www.greenwoodsoftware.com/less/
 Source:         %{name}-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Patch24:        %{name}-%{version}-terminate.patch
 Patch25:        %{name}-%{version}-widechars.patch
 Patch26:        %{name}-%{version}-shell.patch
 Patch27:        %{name}-%{version}-save_line_position.patch
+Patch28:        %{name}-%{version}-more.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -61,6 +62,7 @@ Authors:
 %patch25
 %patch26
 %patch27
+%patch28
 #
 # the ./configure script is not writable for the normal user
 # rather fix permissions for all files
@@ -106,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/bin/*
 
 %changelog
+* Wed Sep 12 2007 - anosek@suse.cz
+- fixed Less -l option conflicts with more -l [#307796] (more.patch)
 * Fri Aug 17 2007 - anosek@suse.cz
 - fixed Incorrect behaviour of -r parameter [#244791]
   (save_line_position.patch)