diff --git a/texi2roff-2.0-gcc4.patch b/texi2roff-2.0-gcc4.patch
index bc6dbf2..2aeb655 100644
--- a/texi2roff-2.0-gcc4.patch
+++ b/texi2roff-2.0-gcc4.patch
@@ -1,6 +1,5 @@
-diff -ru texi2roff-2.0/table.c texi2roff-2.0.new/table.c
---- texi2roff-2.0/table.c	1992-02-20 18:16:37.000000000 +0000
-+++ texi2roff-2.0.new/table.c	2005-03-18 17:59:54.000000000 +0000
+--- texi2roff-2.0/table.c
++++ texi2roff-2.0/table.c	2005-03-18 17:59:54.000000000 +0000
 @@ -32,13 +32,14 @@
  struct misccmds * cmds;
  struct tablerecd * table, * endoftable;
@@ -17,3 +16,13 @@ diff -ru texi2roff-2.0/table.c texi2roff-2.0.new/table.c
      int tablesize;
  
      switch (macropkg) {
+--- texi2roff-2.0/texi2roff.c
++++ texi2roff-2.0/texi2roff.c	2012-07-17 16:09:22.852010105 +0000
+@@ -13,6 +13,7 @@
+ #include <sys/types.h>
+ #endif
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "texi2roff.h"
+ 
+ #if !defined(S_ISDIR) && defined(S_IFDIR)
diff --git a/texinfo.changes b/texinfo.changes
index 9ed5af9..6935a76 100644
--- a/texinfo.changes
+++ b/texinfo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 17 16:11:16 UTC 2012 - werner@suse.de
+
+- Split off makeinfo as separate package to independed from
+  TeXLive 
+
 -------------------------------------------------------------------
 Tue Jul 10 10:09:15 UTC 2012 - werner@suse.de
 
diff --git a/texinfo.spec b/texinfo.spec
index 87abd5c..ed1c04d 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -33,11 +33,11 @@ License:        GPL-2.0+ ; GPL-3.0+
 Group:          Productivity/Publishing/Texinfo
 Url:            http://www.texinfo.org
 PreReq:         %{install_info_prereq}
-Provides:       makeinfo = %{version}
 Provides:       texi2html = %{version_t2h}
 Provides:       texi2roff = %{version_t2r}
 %if %suse_version > 1220
 Requires:       latex2html
+Requires:       makeinfo
 Requires:       texlive-bibtex
 Requires:       texlive-latex
 Requires:       texlive-makeindex
@@ -93,7 +93,7 @@ Authors:
 
 %package -n info
 Summary:        A Stand-Alone Terminal-Based Info Browser
-License:        GPL-2.0+
+License:        GPL-3.0+
 Group:          Productivity/Publishing/Texinfo
 PreReq:         bash zlib libzio
 
@@ -121,6 +121,18 @@ Authors:
     Robert J. Chassell <bob@gnu.org>
     Roland McGrath <roland@gnu.org>
 
+%package -n makeinfo
+Summary:        Translate Texinfo documents to info format
+License:        GPL-3.0+
+Group:          Productivity/Publishing/Texinfo
+Provides:       texinfo:/usr/bin/makeinfo
+Suggests:       texinfo
+
+%description -n makeinfo
+Makeinfo translates  Texinfo source documentation to various other
+formats, by default Info files suitable for reading online with Emacs
+or standalone GNU Info.
+
 %prep
 rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
 %setup -q -b 1 -b 2 -n texinfo-4.13
@@ -220,7 +232,7 @@ test -n "%{buildroot}" && rm -rf %{buildroot}
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/info.info.gz
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 %dir %{_defaultdocdir}/texi2html
 %dir %{_defaultdocdir}/texi2roff
@@ -228,18 +240,21 @@ test -n "%{buildroot}" && rm -rf %{buildroot}
 %doc doc/texinfo.tex doc/txi-*.tex
 %doc %{_defaultdocdir}/texi2html/*
 %doc %{_defaultdocdir}/texi2roff/*
-%{_bindir}/makeinfo
 %{_bindir}/pdftexi*
 %{_bindir}/texi*
 %{_infodir}/texinfo*.gz
 %{_infodir}/texi2html*.gz
-%{_mandir}/man1/makeinfo.1.gz
 %{_mandir}/man1/pdftexi2dvi.1.gz
 %{_mandir}/man1/texi*.1.gz
 %{_mandir}/man5/texinfo.5.gz
 %{_datadir}/texinfo
 %{_datadir}/texi2html
 
+%files -n makeinfo -f %{name}.lang
+%defattr(-,root,root)
+%{_bindir}/makeinfo
+%{_mandir}/man1/makeinfo.1.gz
+
 %files -n info
 %defattr(-,root,root)
 %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir