diff --git a/byobu.spec b/byobu.spec
index 47d317a..3a5dba1 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -5,8 +5,8 @@
 %define _iconsscaldir  %{_iconsbasedir}/scalable/apps
 
 Name:		byobu
-Version:	5.73
-Release:	5%{?dist}
+Version:	5.87
+Release:	1%{?dist}
 Summary:	Light-weight, configurable window manager built upon GNU screen
 
 Group:		Applications/System
@@ -15,16 +15,8 @@ URL:		http://launchpad.net/byobu
 Source0:	http://code.launchpad.net/byobu/trunk/%{version}/+download/byobu_%{version}.orig.tar.gz
 # default windows
 Source1:	fedoracommon
-# patch for wrong logo on RHEL, https://bugs.launchpad.net/byobu/+bug/1278006
-Patch0:		byobu-5.73-logo.patch
-# patch for incorrect shell detection, https://bugs.launchpad.net/byobu/+bug/1280550 
-Patch1:		byobu-5.73-bash.patch
 # patch for "hard" date/time, https://bugs.launchpad.net/byobu/+bug/1284392
-Patch2:		byobu-5.73-tmux_date.patch
-# patch for multiple sourcing, https://bugs.launchpad.net/byobu/+bug/1273685
-Patch3:		byobu-5.73-tmuxrc_source.patch
-# patch for crashing byobu-config, https://bugs.launchpad.net/byobu/+bug/1286249
-Patch4:		byobu-5.73-config_except.patch
+Patch0:		byobu-5.73-tmux_date.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 %if 0%{?rhel}%{?fedora} > 5
@@ -50,22 +42,15 @@ such as toggle-able system status notifications.
 if [ -e "usr/bin/.byobu-status-print.swp" ]; then rm usr/bin/.byobu-status-print.swp
 fi
 # fix path for lib directory in scripts
-for i in `grep -Ri {BYOBU_PREFIX}/lib/ * | awk -F: '{print $1}' | uniq`; do
+for i in `find . -type f -exec grep -l {BYOBU_PREFIX}/lib/ {} \;`; do
 sed -i "s#{BYOBU_PREFIX}/lib/#{BYOBU_PREFIX}/libexec/#g" $i;
 done
-for i in `grep -Ri BYOBU_PREFIX/lib/ * | awk -F: '{print $1}' | uniq`; do
-sed -i "s#BYOBU_PREFIX/lib/#BYOBU_PREFIX/libexec/#g" $i;
-done
 
 # apply patches
 %patch0
-%patch1
-%patch2
-%patch3
-%patch4
 
 # fix path for correct directory in /usr/share
-sed -i "s#DOC = BYOBU_PREFIX + '/share/doc/' + PKG#DOC='%{_pkgdocdir}'#g" usr/lib/byobu/include/config.py
+sed -i "s#DOC = BYOBU_PREFIX + '/share/doc/' + PKG#DOC='%{_pkgdocdir}'#g" usr/lib/byobu/include/config.py.in
 
 # set default fedora windows
 cp -p %{SOURCE1} usr/share/byobu/windows/common
@@ -104,7 +89,7 @@ cp -p usr/share/byobu/pixmaps/byobu.svg %{buildroot}%{_iconsscaldir}
 %find_lang %{name}
 
 %clean
-rm -rf %{buildroot}
+#rm -rf %{buildroot}
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -128,6 +113,9 @@ fi
 %{_iconsscaldir}/%{name}.svg
 %{_pkgdocdir}/*
 %{_bindir}/%{name}*
+%{_bindir}/col1
+%{_bindir}/ctail
+%{_bindir}/wifi-status
 %if 0%{?rhel} == 5
 %{_datadir}/applications/*.desktop
 %else
@@ -135,10 +123,16 @@ fi
 %endif
 %{_datadir}/%{name}/*
 %{_mandir}/man1/%{name}*.1.gz
+%{_mandir}/man1/col1.1.gz
+%{_mandir}/man1/ctail.1.gz
+%{_mandir}/man1/wifi-status.1.gz
 %{_libexecdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/%{name}/*
 
 %changelog
+* Tue Nov 11 2014 Jan Klepek <jan.klepek at, gmail.com> - 5.87-1
+- update to 5.87
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.73-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild