diff --git a/libedit-20180525-manpage-conflicts.patch b/libedit-20180525-manpage-conflicts.patch
new file mode 100644
index 0000000..9f8bf78
--- /dev/null
+++ b/libedit-20180525-manpage-conflicts.patch
@@ -0,0 +1,59 @@
+From: 1Antoine1 <antoine.belvire@opensuse.org>
+Date: 2018-08-06 11:47:22 +0200
+Subject: doc: File conlicts with readline-doc
+References: (none)
+Upstream: not submitted yet
+
+Make sure all manpages are prefixed with "el_" in order to avoid
+file conflicts with readline-doc.
+
+---
+diff -up libedit-20180525-3.1/doc/Makefile.am.orig libedit-20180525-3.1/doc/Makefile.am
+--- libedit-20180525-3.1/doc/Makefile.am.orig	2018-08-06 11:37:52.160085685 +0200
++++ libedit-20180525-3.1/doc/Makefile.am	2018-08-06 11:39:04.352082128 +0200
+@@ -20,14 +20,14 @@ EL_MAN_LINKS = \
+ 		el_resize.3 \
+ 		el_set.3 \
+ 		el_source.3 \
+-		history.3 \
+-		history_end.3 \
+-		history_init.3 \
+-		tok_end.3 \
+-		tok_init.3 \
+-		tok_line.3 \
+-		tok_reset.3 \
+-		tok_str.3
++		el_history.3 \
++		el_history_end.3 \
++		el_history_init.3 \
++		el_tok_end.3 \
++		el_tok_init.3 \
++		el_tok_line.3 \
++		el_tok_reset.3 \
++		el_tok_str.3
+ 
+ EL_MAN_LINKS += \
+ 		el_wdeletestr.3 \
+@@ -39,14 +39,14 @@ EL_MAN_LINKS += \
+ 		el_wparse.3 \
+ 		el_wpush.3 \
+ 		el_wset.3 \
+-		history_w.3 \
+-		history_wend.3 \
+-		history_winit.3 \
+-		tok_wend.3 \
+-		tok_winit.3 \
+-		tok_wline.3 \
+-		tok_wreset.3 \
+-		tok_wstr.3
++		el_history_w.3 \
++		el_history_wend.3 \
++		el_history_winit.3 \
++		el_tok_wend.3 \
++		el_tok_winit.3 \
++		el_tok_wline.3 \
++		el_tok_wreset.3 \
++		el_tok_wstr.3
+ 
+ 
+ install-data-hook: $(EL_MAN_LINKS)
diff --git a/libedit.changes b/libedit.changes
index 769ca68..e48c0cc 100644
--- a/libedit.changes
+++ b/libedit.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug  6 09:13:50 UTC 2018 - antoine.belvire@opensuse.org
+
+- Bump version tag.
+- Make sure all manpages are prefixed with "el_" to avoid file
+  conflicts with readline-doc:
+  * Add libedit-20180525-manpage-conflicts.patch.
+
 -------------------------------------------------------------------
 Mon Jul 23 06:41:08 UTC 2018 - mpluskal@suse.com
 
diff --git a/libedit.spec b/libedit.spec
index 32a8019..e646e74 100644
--- a/libedit.spec
+++ b/libedit.spec
@@ -20,7 +20,7 @@
 %define soname 0
 %define library_name libedit%{soname}
 Name:           libedit
-Version:        3.1.snap20150325
+Version:        3.1.snap20180525
 Release:        0
 Summary:        Command Line Editing and History Library
 License:        BSD-3-Clause
@@ -29,7 +29,11 @@ URL:            http://www.thrysoee.dk/editline/
 Source:         http://thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
 Source1:        README.SUSE
 Source2:        baselibs.conf
+# PATCH-FIX-UPSTREAM libedit-20180525-manpage-conflicts.patch
+Patch0:         libedit-20180525-manpage-conflicts.patch
 #BuildRequires:  gcc-c++
+# For patch0
+BuildRequires:  automake
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ncurses)
 
@@ -66,6 +70,7 @@ This package holds the development files for libedit.
 %prep
 %setup -q -n %{name}-%{pkg_version}
 cp %{SOURCE1} .
+%patch0 -p1
 
 %build
 %configure \