diff --git a/munin.spec b/munin.spec
index a5211ef..4e9ae92 100644
--- a/munin.spec
+++ b/munin.spec
@@ -63,10 +63,6 @@ BuildRequires:  perl-Carp
 BuildRequires:  systemd
 BuildRequires:  firewalld-filesystem
 %endif
-%if 0%{?rhel} <= 7
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-%endif
 
 # Munin server requires
 Requires:       %{name}-common = %{version}
@@ -141,12 +137,10 @@ Provides:  munin-async = %{version}-%{release}
 Obsoletes: munin-async < 2.0.39-4
 Provides:  munin-netip-plugins = %{version}-%{release}
 Obsoletes: munin-netip-plugins < 2.0.39-4
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28
 Provides:  munin-java-plugins = %{version}-%{release}
 Obsoletes: munin-java-plugins < 2.0.39-2
 Provides:  munin-plugins-java = %{version}-%{release}
 Obsoletes: munin-plugins-java < 2.0.45-2
-%endif
 
 
 %description node
@@ -188,20 +182,6 @@ This package contains common files that are used by both the server (munin)
 and node (munin-node) packages.
 
 
-%if 0%{?rhel} <= 7
-%package plugins-java
-Summary:   Java plugins for Munin resource monitoring
-Requires:  %{name}-node = %{version}
-BuildArch: noarch
-Provides:  munin-java-plugins = %{version}-%{release}
-Obsoletes: munin-java-plugins < 2.0.39-2
-
-
-%description plugins-java
-Additional Java plugins for munin-node.
-%endif
-
-
 %package plugins-ruby
 Summary:   Ruby plugins for Munin resource monitoring
 Requires:  %{name}-node = %{version}
@@ -285,9 +265,6 @@ sed -i -e '
   s,^PYTHON     := \(.*\),PYTHON     := /usr/bin/python2,;
 %endif
   s,^RUBY       := \(.*\),RUBY       := /usr/bin/ruby,;
-%if 0%{?rhel} <= 7
-  s,^JAVALIBDIR = \(.*\),JAVALIBDIR = $(DESTDIR)%{_javadir},;
-%endif
   s,^PERLLIB    = \(.*\),PERLLIB    = $(DESTDIR)%{perl_vendorlib},;
   s,^HOSTNAME   := \(.*\),HOSTNAME   := localhost.localdomain,;
   s,^PLUGINUSER := \(.*\),PLUGINUSER := munin,;
@@ -309,16 +286,10 @@ cp %SOURCE18 .
 
 
 %build
-%if 0%{?rhel} <= 7
-export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$CLASSPATH
-%endif
 make    CONFIG=Makefile.config
 
 
 %install
-%if 0%{?rhel} <= 7
-export  CLASSPATH=plugins/javalib/org/munin/plugin/jmx:$CLASSPATH
-%endif
 make    CONFIG=Makefile.config \
         DESTDIR=%{buildroot} \
         install
@@ -679,7 +650,8 @@ fi
 %attr(0700, munin, munin) %dir %{_sharedstatedir}/munin/.ssh
 %config(noreplace) %attr(0600, munin, munin) %{_sharedstatedir}/munin/.ssh/config
 %attr(-, munin, munin) %dir %{_localstatedir}/log/munin
-%attr(-, munin, munin) %{_localstatedir}/www/html/munin
+%attr(-, munin, munin) %dir %{_localstatedir}/www/html/munin
+%attr(-, munin, munin) %{_localstatedir}/www/html/munin/cgi
 %attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-html.log
 %attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-limits.log
 %attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-update.log
@@ -722,7 +694,6 @@ fi
 %dir %{_datadir}/munin
 %{_datadir}/munin/munin-async
 %{_datadir}/munin/plugins/
-%exclude %{_datadir}/munin/plugins/jmx_
 %exclude %{_datadir}/munin/plugins/tomcat_
 %exclude %{_datadir}/munin/plugins/munin_stats
 %{perl_vendorlib}/Munin/Node
@@ -755,13 +726,6 @@ fi
 %endif
 
 
-%if 0%{?rhel} <= 7
-%files plugins-java
-%{_javadir}/munin-jmx-plugins.jar
-%{_datadir}/munin/plugins/jmx_
-%endif
-
-
 %files plugins-ruby
 %{_datadir}/munin/plugins/tomcat_
 
@@ -795,7 +759,6 @@ fi
 %changelog
 * Sat Jul 13 2019 Kim B. Heino <b@bbbs.net> - 2.0.49-3
 - rhbz#1721384: Mark .htaccess as ghost, include it to example config files
-- Re-add munin-plugins-java subpackage for rhel6 and rhel7
 
 * Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.0.49-2
 - Perl 5.30 rebuild