diff --git a/bugzilla.spec b/bugzilla.spec
index 7ba263b..7246630 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -43,12 +43,16 @@ BuildRequires: python-sphinx
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
-BuildRequires: texlive-upquote
 BuildRequires: tex-framed
 BuildRequires: tex-multirow
 BuildRequires: tex-threeparttable
 BuildRequires: tex-titlesec
 BuildRequires: tex-wrapfig
+%if 0%{?fedora}
+BuildRequires: texlive-capt-of.noarch
+BuildRequires: texlive-eqparbox.noarch
+BuildRequires: texlive-upquote
+%endif
 
 %package doc
 Summary: Bugzilla documentation
@@ -72,20 +76,50 @@ BuildRequires: python
 # mod_perl modules
 %global __requires_exclude %__requires_exclude|^perl\\(Apache2::
 %global __requires_exclude %__requires_exclude|^perl\\(ModPerl::
+# installation of optional modules
+%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$
 # authentification modules
 %global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP
 # database modules
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$
+# graphical reports and charts
+%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$
 # inbound email modules
 %global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$
+# automatic charset detection for text attachments
+%global __requires_exclude %__requires_exclude|^perl\\(Encode
+# sniff MIME type of attachments
+%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$
+# mail queueing
+%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$
+# smtp security
+%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$
 # bug moving modules
 %global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$
+# update notifications
+%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$
+# use html in product and group descriptions
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$
+# memcached support
+%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$
+# documentation
+%global __requires_exclude %__requires_exclude|^perl\\(File::Copy::Recursive\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$
 # xml-rpc and json-rpc modules
 %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::
 %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$
@@ -250,6 +284,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Jul 17 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-2
+- Add build requirements for texlive sub-packages
+- Filter out more optional dependencies
+
 * Mon May 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-1
 - Update to 5.0.3, dropping backported patch
 
@@ -260,7 +298,7 @@ popd > /dev/null)
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Sat Jan 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-1
-- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609)
+- Update to 5.0.2, with thanks to Tuomo Soini (#1275609)
 - Use dnf instead of yum when advising to install perl modules
 - Change documentation URL to bugzilla.readthedocs.org