diff --git a/munin.spec b/munin.spec
index 41ed19a..8eb8247 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.30
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -416,12 +416,18 @@ install -m 0644 %{SOURCE4} %{buildroot}/etc/logrotate.d/munin
 # BZ#821912 - Move .htaccess to apache config to allow easier user-access changes.
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 sed -e 's/# </</g' %{buildroot}/var/www/html/munin/.htaccess > %{buildroot}%{_sysconfdir}/httpd/conf.d/munin.conf
-echo "ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph" >> \
-  %{buildroot}%{_sysconfdir}/httpd/conf.d/munin.conf
 
 # BZ#1312121 - Munin dynamic graph zoom (dynazoom) failing due to Apache config.
 cat - >> %{buildroot}%{_sysconfdir}/httpd/conf.d/munin.conf <<EOT
+AddType text/css .css
+AddType text/javascript .js
+
+ScriptAlias /munin-cgi/munin-cgi-graph /var/www/cgi-bin/munin-cgi-graph
+
 <Location /munin-cgi/munin-cgi-graph>
+  Options ExecCGI
+  SetHandler cgi-script
+
   AuthUserFile /etc/munin/munin-htpasswd
   AuthName "Munin"
   AuthType Basic
@@ -871,6 +877,9 @@ exit 0
 
 
 %changelog
+* Sun Jan 29 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-3
+- added Pablo Chamorro packaging suggestions for helping CGI scripts
+
 * Wed Jan 25 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-2
 - RHBZ#: 1416199 - Munin-node is unable to determine FQDN hostname at boot