diff --git a/.cvsignore b/.cvsignore
index 6b5e552..a5bafb3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mrtg-2.10.15.tar.gz
+mrtg-2.11.0.tar.gz
diff --git a/mrtg.spec b/mrtg.spec
index 53c7088..3230e60 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -5,8 +5,8 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.10.15
-Release:   3
+Version:   2.11.0
+Release:   1
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
 Source3:   mrtg.cfg
@@ -17,7 +17,6 @@ Source7:   mrtg.crond.in
 Source8:   mrtg-httpd.conf
 Patch:     mrtg-2.9.17-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
-Patch2:	   mrtg-2.10.15-badman.patch
 License:   GPL
 Group:     Applications/Internet
 Requires:  perl >= 0:5.004
@@ -37,7 +36,6 @@ images which provide a LIVE visual representation of this traffic.
 %setup -q
 %patch -p0 -b .lib64
 %patch1 -p1
-%patch2 -p1 -b .badman
 
 for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -54,18 +52,16 @@ find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \;
 
 %install
 rm -rf   $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/mrtg
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lock/mrtg
 mkdir -p $RPM_BUILD_ROOT%{contentdir}
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mrtg2/Pod
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 
 install -m 644 images/*   $RPM_BUILD_ROOT%{contentdir}/
-install -m 644 doc/*.html $RPM_BUILD_ROOT%{contentdir}/
 sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{_localstatedir}/lib/mrtg,g' \
 	%{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
@@ -79,24 +75,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf
 install -m 644 %{SOURCE4} contrib/14all/README
 install -m 755 %{SOURCE5} contrib/14all
 
-for i in bin/mrtg bin/rateup bin/cfgmaker bin/indexmaker; do
-	install -m 755 -c $i $RPM_BUILD_ROOT%{_bindir}/
-done
 for i in mrtg cfgmaker indexmaker; do
 	%{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i
 done
 
-for i in lib/mrtg2/*.pm; do
-	install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/mrtg2/
-done
-
-for i in lib/mrtg2/Pod/*.pm; do
-	install -m 644 $i $RPM_BUILD_ROOT%{_libdir}/mrtg2/Pod/
-done
-
-for i in doc/*.1; do
-	install -m 644 $i $RPM_BUILD_ROOT%{_mandir}/man1/
-done 
 %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_mandir}/man1/*.1
 
 # Tell crond to reload its configuration.
@@ -126,10 +108,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/mrtg2
 %{_mandir}/*/*
+%exclude %{_datadir}/mrtg2/icons
+%exclude %{_datadir}/doc/mrtg2
 %dir %{_localstatedir}/lib/mrtg
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Mon Dec 13 2004 Miloslav Trmac <mitr@redhat.com> - 2.11.0-1
+- Update to mrtg-2.11.0
+- Don't install HTML documentation to /var/www/mrtg
+- Clean up %%install a bit
+
 * Tue Nov 23 2004 Miloslav Trmac <mitr@redhat.com> - 2.10.15-3
 - Convert man pages to UTF-8
 
diff --git a/sources b/sources
index 3002d61..a1d2eef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39f3afeac9a7fdba8e4e500313234e50  mrtg-2.10.15.tar.gz
+8f3b2a73f4fb03a556be78c5400eb3b4  mrtg-2.11.0.tar.gz