diff --git a/texinfo.spec b/texinfo.spec
index ad44e8a..98c0b0c 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -14,8 +14,10 @@ Patch0: texinfo-4.12-zlib.patch
 Patch1: texinfo-4.13a-powerpc.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Requires: perl >= 5.7.3
-BuildRequires: zlib-devel, ncurses-devel, help2man, perl(Data::Dumper)
+Requires: perl >= 5.7.3, perl(Text::Unidecode)
+# Review Request for perl-Unicode-EastAsianWidth - bz874743
+#Requires: perl(Unicode::EastAsianWidth)
+BuildRequires: zlib-devel, ncurses-devel, perl(Data::Dumper)
 
 %description
 Texinfo is a documentation system that can produce both online
@@ -57,7 +59,10 @@ for printing using TeX.
 %patch1 -p1 -b .powerpc
 
 %build
-%configure
+%configure --with-external-Text-Unidecode \
+           --with-external-libintl-perl \
+# line below - bz874743
+#            --with-external-Unicode-EastAsianWidth
 make %{?_smp_mflags}
 
 %install
@@ -71,11 +76,6 @@ install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_infodir}/dir
 mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
 
-# Convert ChangeLog to UTF-8
-/usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog_utf8
-touch -r ChangeLog ChangeLog_utf8
-mv ChangeLog_utf8 ChangeLog
-
 %find_lang %{name}
 %find_lang %{name}_document
 
@@ -117,10 +117,14 @@ fi
 %files -f %{name}.lang -f %{name}_document.lang
 %doc AUTHORS ChangeLog NEWS README TODO COPYING
 %{_bindir}/makeinfo
+%{_bindir}/texi2any
+%{_bindir}/pod2texi
 %{_datadir}/texinfo
 %{_infodir}/texinfo*
 %{_mandir}/man1/makeinfo.1*
 %{_mandir}/man5/texinfo.5*
+%{_mandir}/man1/texi2any.1*
+%{_mandir}/man1/pod2texi.1*
 
 %files -n info
 %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
@@ -140,17 +144,17 @@ fi
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
 %{_bindir}/pdftexi2dvi
-%{_bindir}/pod2texi
-%{_bindir}/texi2any
 %{tex_texinfo}/
 %{_mandir}/man1/texindex.1*
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*
 %{_mandir}/man1/pdftexi2dvi.1*
-%{_mandir}/man1/pod2texi.1*
-%{_mandir}/man1/texi2any.1*
 
 %changelog
+* Wed Feb 20 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.0-2
+- Fix configure arguments, remove help2man require, remove ChangeLog conversion,
+  move texi2any/pod2texi to main package
+
 * Tue Feb 19 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 5.0-1
 - Update to texinfo-5.0