diff -Naur --exclude '*.orig' --exclude '*~' mrtg-2.15.2/bin/cfgmaker mrtg-2.15.2.fhs/bin/cfgmaker
--- mrtg-2.15.2/bin/cfgmaker	2007-04-29 09:10:49.000000000 +0200
+++ mrtg-2.15.2.fhs/bin/cfgmaker	2007-09-27 23:26:33.000000000 +0200
@@ -42,9 +42,7 @@
     }
 }
 
-use FindBin;
-use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib '/usr/share/mrtg/lib';
 
 use MRTG_lib "2.100015";
 use Getopt::Long;
diff -Naur --exclude '*.orig' --exclude '*~' mrtg-2.15.2/bin/indexmaker mrtg-2.15.2.fhs/bin/indexmaker
--- mrtg-2.15.2/bin/indexmaker	2007-04-29 09:10:49.000000000 +0200
+++ mrtg-2.15.2.fhs/bin/indexmaker	2007-09-27 23:26:33.000000000 +0200
@@ -46,9 +46,7 @@
     }
 }
 
-use FindBin;
-use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib '/usr/share/mrtg/lib';
 
 use MRTG_lib "2.100016";
 use Getopt::Long;
diff -Naur --exclude '*.orig' --exclude '*~' mrtg-2.15.2/bin/mrtg mrtg-2.15.2.fhs/bin/mrtg
--- mrtg-2.15.2/bin/mrtg	2007-04-29 09:10:49.000000000 +0200
+++ mrtg-2.15.2.fhs/bin/mrtg	2007-09-27 23:30:12.000000000 +0200
@@ -79,9 +79,7 @@
 }
 
 
-use FindBin;
-use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib '/usr/share/mrtg/lib';
 use Getopt::Long;
 use Math::BigFloat;
 
@@ -862,10 +860,10 @@
     }                 
     ########## rrdtool users have left here ###############
 
-    ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "${FindBin::Bin}${MRTG_lib::SL}rateup.exe")) or
+    ((($MRTG_lib::OS eq 'NT' or $MRTG_lib::OS eq 'OS2') and (-e "/usr/bin/rateup.exe")) or
      (($MRTG_lib::OS eq 'NW') and (-e "SYS:/Mrtg/bin/rateup.nlm")) or
-     (-x "${FindBin::Bin}${MRTG_lib::SL}rateup")) or 
-       die "$NOW: ERROR: Can't Execute '${FindBin::Bin}${MRTG_lib::SL}rateup'\n";
+     (-x "/usr/bin/rateup")) or 
+       die "$NOW: ERROR: Can't Execute '/usr/bin/rateup'\n";
 
     # rateup does not know about undef so we make inlast and outlast ready for rateup
     #warn "$NOW: ERROR: inlast is undefined. Skipping $router\n" unless defined $inlast;
@@ -877,7 +875,7 @@
     $outlast = -1 unless defined $outlast;
     
     if ($$rcfg{'options'}{'dorelpercent'}{$router}) {
-        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
+        @exec = ("/usr/bin/rateup", 
                  "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                  $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                  "$up_abs"."p", $inlast, $outlast, $absmax,
@@ -886,7 +884,7 @@
                  $$rcfg{'rgb5'}{$router});
     } else { 
 
-        @exec = ("${FindBin::Bin}${MRTG_lib::SL}rateup", 
+        @exec = ("/usr/bin/rateup", 
                  "$$cfg{'logdir'}$$rcfg{'directory'}{$router}","$router",
                  $time, $$rcfg{'options'}{'unknaszero'}{$router} ? '-z':'-Z',
                  "$up_abs", $inlast, $outlast, $absmax,
diff -Naur --exclude '*.orig' --exclude '*~' mrtg-2.15.2/bin/mrtg-traffic-sum mrtg-2.15.2.fhs/bin/mrtg-traffic-sum
--- mrtg-2.15.2/bin/mrtg-traffic-sum	2006-12-22 09:46:40.000000000 +0100
+++ mrtg-2.15.2.fhs/bin/mrtg-traffic-sum	2007-09-27 23:30:59.000000000 +0200
@@ -21,9 +21,7 @@
     }
 }
 
-use FindBin;
-use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib '/usr/share/mrtg/lib';
 use MRTG_lib "2.090017";
 use POSIX qw(mktime);
 
diff -Naur --exclude '*.orig' --exclude '*~' mrtg-2.15.2/Makefile.in mrtg-2.15.2.fhs/Makefile.in
--- mrtg-2.15.2/Makefile.in	2007-04-29 08:58:47.000000000 +0200
+++ mrtg-2.15.2.fhs/Makefile.in	2007-09-27 23:26:33.000000000 +0200
@@ -50,17 +50,15 @@
 	  $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
 	for x in bin/rateup; do \
 	  $(INSTALL) -m 755 $$x $(DESTDIR)$(bindir); done
-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/mrtg2/Pod
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg/lib
 	for x in $(top_srcdir)/lib/mrtg2/*.pm; do \
-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2; done
+	  $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg/lib; done
+	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg/pod
 	for x in $(top_srcdir)/lib/mrtg2/Pod/*.pm; do \
-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(libdir)/mrtg2/Pod; done
-	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mrtg2/icons
-	for x in $(top_srcdir)/images/*.gif $(top_srcdir)/images/*.png; do \
-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg2/icons; done
-	$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/doc/mrtg2
-	(cd $(top_srcdir); for x in COPYING COPYRIGHT README CHANGES THANKS doc/*.pod doc/*.txt doc/*.png; do \
-	  $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/doc/mrtg2; done)
+	  $(INSTALL) -m 644 $$x $(DESTDIR)$(datadir)/mrtg/pod; done
+	$(MKINSTALLDIRS) $(DESTDIR)/var/lib/mrtg
+	for x in $(top_srcdir)/images/*.png; do \
+	  $(INSTALL) -m 644 $$x $(DESTDIR)/var/lib/mrtg; done
 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
 	for x in $(top_srcdir)/doc/*.1; do \
 	  $(INSTALL) -m 644 $$x $(DESTDIR)$(mandir)/man1; done