diff --git a/Text-Tabs+Wrap-2013.0523-Build-from-lib.patch b/Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
new file mode 100644
index 0000000..82c76ec
--- /dev/null
+++ b/Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
@@ -0,0 +1,56 @@
+From 425354918f774c39c68b79de55691ee262cdcb84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 25 Mar 2015 17:57:05 +0100
+Subject: [PATCH] Build from lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building from lib.modern adds "modern::" prefix to manual pages.
+
+This is a work-around for CPAN RT#103116. Creating symlink is not
+enough for EU::MM.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+diff --git a/Makefile.PL b/Makefile.PL
+index a8dbc7e..1b5b51a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,10 +1,15 @@
+ 
+ use ExtUtils::MakeMaker;
+ 
++if (!-d 'lib') {
++    rename (($] > 5.010 ? 'lib.modern' : 'lib.old'), 'lib') or
++        die "Could not rename to lib: $!";
++}
++
+ WriteMakefile( 
+ 	'NAME'		=> 'Text-Wrap',
+ 	'DISTNAME'	  => 'Text-Tabs+Wrap',
+-	'VERSION_FROM' => 'lib.modern/Text/Wrap.pm',
++	'VERSION_FROM' => 'lib/Text/Wrap.pm',
+ 	($] >= 5.005 ? 
+ 		(
+ 			ABSTRACT	=> 'Expand tabs and do simple line wrapping',
+@@ -21,16 +26,5 @@ WriteMakefile(
+ 	'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" },
+ 	'INSTALLDIRS'	=> 'perl',
+ 
+-	PM =>	($] > 5.010 ?
+-		{
+-			'lib.modern/Text/Tabs.pm'	=> '$(INST_LIBDIR)/Text/Tabs.pm',
+-			'lib.modern/Text/Wrap.pm'	=> '$(INST_LIBDIR)/Text/Wrap.pm',
+-		}
+-		:
+-		{
+-			'lib.old/Text/Tabs.pm'	=> '$(INST_LIBDIR)/Text/Tabs.pm',
+-			'lib.old/Text/Wrap.pm'	=> '$(INST_LIBDIR)/Text/Wrap.pm',
+-		})
+-
+ 	);
+ 
+-- 
+2.1.0
+
diff --git a/perl-Text-Tabs+Wrap.spec b/perl-Text-Tabs+Wrap.spec
index a170755..fa57ed4 100644
--- a/perl-Text-Tabs+Wrap.spec
+++ b/perl-Text-Tabs+Wrap.spec
@@ -6,6 +6,8 @@ License:        TTWL
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Text-Tabs%2BWrap/
 Source0:        http://www.cpan.org/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-%{version}.tar.gz
+# Work around CPAN RT#103116
+Patch0:         Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -22,6 +24,8 @@ BuildRequires:  perl(warnings)
 # Optional tests:
 # Benchmark not used
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+# Sub-packaged from perl.spec, it would conflicted on manual pages
+Conflicts:      perl < 4:5.20.2-325
 
 %description
 Text::Tabs performs the same job that the UNIX expand(1) and unexpand(1)
@@ -32,6 +36,7 @@ up long lines, it will not join short lines together.
 
 %prep
 %setup -q -n Text-Tabs+Wrap-%{version}
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor
@@ -53,6 +58,7 @@ make test
 %changelog
 * Wed Mar 25 2015 Petr Pisar <ppisar@redhat.com> - 2013.0523-326
 - Increase release number to compete with perl's sub-package
+- Fix manual pages names
 
 * Wed Feb 13 2013 Petr Pisar <ppisar@redhat.com> - 2013.0523-1
 - Version 2013.0523 packaged