diff -ruN ../work/wmmon.app/wmmon/Makefile ./wmmon.app/wmmon/Makefile
--- ../work/wmmon.app/wmmon/Makefile	Thu Nov 15 04:20:26 2001
+++ ./wmmon.app/wmmon/Makefile	Sat Nov 24 01:15:54 2001
@@ -2,14 +2,14 @@
 # Makefile for FreeBSD 3.x and 4.0 versions of wmmon
 #
 LIBDIR		= -L${X11BASE}/lib
-LIBS		= -lXpm -lXext -lX11 -lkvm -ldevstat
+LIBS		= -lXpm -lXext -lX11 # -lkvm -ldevstat
 CFLAGS		?= -O2
-CFLAGS		+= -I${X11BASE}/include
+CFLAGS		+= -I${X11BASE}/include -DFIVAMON
 OBJS		=	wmmon.o \
 			../wmgeneral/wmgeneral.o \
 			../wmgeneral/misc.o \
 			../wmgeneral/list.o
-PROG	= wmmon
+PROG	= fivamon
 
 .c.o:
 	${CC} -c $(CFLAGS) $< -o $*.o
diff -ruN ../work/wmmon.app/wmmon/fivamon-master.xpm ./wmmon.app/wmmon/fivamon-master.xpm
--- ../work/wmmon.app/wmmon/fivamon-master.xpm	Thu Jan  1 09:00:00 1970
+++ ./wmmon.app/wmmon/fivamon-master.xpm	Sat Nov 24 00:59:21 2001
@@ -0,0 +1,164 @@
+/* XPM */
+static char * wmmon_master_xpm[] = {
+"128 120 41 1",
+" 	c #00000000FFFF",
+".	c #000000000000",
+"X	c #208120812081",
+"o	c #C71BC71BC71B",
+"O	c #28A23CF30000",
+"+	c #28A238E30000",
+"@	c #30C238E30000",
+"#	c #30C234D30000",
+"$	c #38E330C20000",
+"%	c #41032CB20000",
+"&	c #492428A20000",
+"*	c #514424920000",
+"=	c #596520810000",
+"-	c #59651C710000",
+";	c #61851C710000",
+":	c #618518610000",
+">	c #18618A288617",
+",	c #2081B2CAAEBA",
+"<	c #000049244103",
+"1	c #104079E779E7",
+"2	c #2081D34C0000",
+"3	c #30C2CB2B0000",
+"4	c #38E3BEFB0000",
+"5	c #4103B6DA0000",
+"6	c #4924AAAA0000",
+"7	c #5965A2890000",
+"8	c #618596580000",
+"9	c #69A68E380000",
+"0	c #71C682070000",
+"q	c #861779E70000",
+"w	c #8E386DB60000",
+"e	c #965865950000",
+"r	c #9E7959650000",
+"t	c #AEBA51440000",
+"y	c #B6DA45140000",
+"u	c #BEFB3CF30000",
+"i	c #C71B30C20000",
+"p	c #10407DF779E7",
+"a	c #00007DF771C6",
+"s	c #2081B6DAAEBA",
+"d	c #71C6E38D71C6",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"    ......................  ................................        ......................  ................................    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X>XXXX,>,X>,,>X>,,>Xo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X,XXXXX,XX,XXXX,XXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X,XXXXX,XX,XXXX,XXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X>XXXXX,XX>,,>X>,,>Xo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X,XXXXX,XX,XXXX,XXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X,XXXXX,XX,XXXX,XXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .X>,,>X,>,X>XXXX>,,>Xo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    oooooooooooooooooooooo  oooooooooooooooooooooooooooooooo        oooooooooooooooooooooo  oooooooooooooooooooooooooooooooo    ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"    ........................................................        ......................  ................................    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX>,,XX>,,>XXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX,XX,X,XX,XXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX,XX,X,XXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX>,,>X>XXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX,XX,X,XXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX,XX,X,XX,XXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXX,XX,X>,,XXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXo  .OOOO++@##$$$$%%%&&&&****=--;;:o    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        oooooooooooooooooooooo  oooooooooooooooooooooooooooooooo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo                                                                    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo                                                                    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        ........................................................    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<XXX<<<XXX<<<XXX<<<XXXXXXXX<<<XXX<<<XXX<<<XXX<<<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXX<X<XXX<X<XXX<X<XXX<XXXXXX<XXX<X<XXX<X<XXX<X<XXX<Xo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXX<X<XXX<X<XXX<X<XXX<XXXXXX<XXX<X<XXX<X<XXX<X<XXX<Xo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<XXX<<<XXX<<<XXX<<<XXXXXXXX<<<XXX<<<XXX<<<XXX<<<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXX<X<XXX<X<XXX<X<XXX<XXXXXX<XXX<X<XXX<X<XXX<X<XXX<Xo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXX<X<XXX<X<XXX<X<XXX<XXXXXX<XXX<X<XXX<X<XXX<X<XXX<Xo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<XXX<<<XXX<<<XXX<<<XXXXXXXX<<<XXX<<<XXX<<<XXX<<<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XX>,XX<XXXX<X<XXXX<XX>,XX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XX1,XX<XXXX<X<XXXX<XX1,XX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XXXXXX<XXXX<X<XXXX<XXXXXX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XXXXXX<XXXX<X<XXXX<XXXXXX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XX>,XX<XXXX<X<XXXX<XX>,XX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .X<XXXX<X<XXXX<XX1,XX<XXXX<X<XXXX<XX1,XX<XXXX<X<XXXX<XXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXXXXXX<<<<XXX<<<<XXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo        .XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXo    ",
+"    oooooooooooooooooooooooooooooooooooooooooooooooooooooooo        oooooooooooooooooooooooooooooooooooooooooooooooooooooooo    ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"................................................................                                                                ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio XX,,,XXX<<<>X>,,,>X>,,,>X,<<<,X>,,,>X>,,,>X>,,,>X>,,,>X>,,,>X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio X,XXX,X<XXX,X<XXX,X<XXX,X,XXX,X,XXX<X,XXX<X<XXX,X,XXX,X,XXX,X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio X,XXX,X<XXX,X<XXX,X<XXX,X,XXX,X,XXX<X,XXX<X<XXX,X,XXX,X,XXX,X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio X><<<>XX<<<>X>,,,>XX,,,>X>,,,>X,,,,>X>,,,>XX<<<>X>,,,>Xp,,,>X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio X,XXX,X<XXX,X,XXX<X<XXX,X<XXX,X<XXX,X,XXX,X<XXX,X,XXX,X<XXX,X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio X,XXX,X<XXX,X,XXX<X<XXX,X<XXX,X<XXX,X,XXX,X<XXX,X,XXX,X<XXX,X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio XX,,,XXX<<<,X>,,,>X>,,,>XX<<<>X>,,,>X>,,,>XX<<<,X>,,,>X>,,,>X  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  ",
+".OOOO++@##$$$$%%%&&&&****=--;;:o.2233445667788990qqwweerrtyyuuio                                                                ",
+"oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo                                                                ",
+"                                                                                                                                ",
+"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX             ",
+"XasssaXasssaXasssaXXasssaXasssaXX<<<XX XX,,,,XXX<<<<pXp,,,,>Xp,,,,pXp<<<<pXp,,,,pXp,,,,>Xp,,,,pXp,,,,>Xp,,,,>XXXXXX             ",
+"XsXXXsXsXXX<X<XsX<XXsXXXsXsXXX<X<XXX<X X,XXXX,X<XXXX,X<XXXX,X<XXXX,X,XXXX,X,XXXX<X,XXXX<X<XXXX,X,XXXX,X,XXXX,XX>,XX             ",
+"XsXXXsXsXXX<X<XsX<XXsXXXsXsXXX<X<XXX<X X,XXXX,X<XXXX,X<XXXX,X<XXXX,X,XXXX,X,XXXX<X,XXXX<X<XXXX,X,XXXX,X,XXXX,XXp,XX             ",
+"XasssaXa<<<XXX<a<XXXasssaXa<<<XXX<<<XX X,XXXX,X<XXXX,X<XXXX,X<XXXX,X,XXXX,X,XXXX<X,XXXX<X<XXXX,X,XXXX,X,XXXX,XXXXXX             ",
+"XsXXX<XsXXX<X<XsX<XX<XXX<XsXXX<X<XXX<X Xp<<<<pXX<<<<pXp,,,,pXp,,,,pXp,,,,pXp,,,,pXp,,,,pXX<<<<pXp,,,,pXp,,,,pXXXXXX             ",
+"XsXXX<XsXXX<X<XsX<XX<XXX<XsXXX<X<XXX<X X,XXXX,X<XXXX,X,XXXX<X<XXXX,X<XXXX,X<XXXX,X,XXXX,X<XXXX,X,XXXX,X<XXXX,XXXXXX             ",
+"Xa<<<XXasssaXX<a<XXXX<<<XXasssaXX<<<XX X,XXXX,X<XXXX,X,XXXX<X<XXXX,X<XXXX,X<XXXX,X,XXXX,X<XXXX,X,XXXX,X<XXXX,XX>,XX             ",
+"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X,XXXX,X<XXXX,X,XXXX<X<XXXX,X<XXXX,X<XXXX,X,XXXX,X<XXXX,X,XXXX,X<XXXX,XXp,XX             ",
+"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX,,,,XXX<<<<pXp,,,,pXp,,,,pXX<<<<pXp,,,,pXp,,,,pXX<<<<pXp,,,,pXp,,,,pXXXXXX             ",
+"                                       XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX             ",
+"  a                                                                                                                             ",
+"  s                                                                                                                             ",
+"  X                                                                                                                             ",
+"  d                                                                                                                             ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                ",
+"                                                                                                                                "};
diff -ruN ../work/wmmon.app/wmmon/wmmon.c ./wmmon.app/wmmon/wmmon.c
--- ../work/wmmon.app/wmmon/wmmon.c	Thu Nov 15 04:20:26 2001
+++ ./wmmon.app/wmmon/wmmon.c	Sat Nov 24 01:28:51 2001
@@ -111,7 +111,11 @@
 #include "../wmgeneral/wmgeneral.h"
 #include "../wmgeneral/misc.h"
 
+#ifdef FIVAMON
+#include "fivamon-master.xpm"
+#else
 #include "wmmon-master.xpm"
+#endif
 #include "wmmon-mask.xbm"
 
   /***********/
@@ -230,11 +234,13 @@
 		}
 	}
 
+#ifndef FIVAMON
 	if( checkversion() < 0 )
 	{
 		fprintf( stderr, devstat_errbuf );
 		exit(1);
 	}
+#endif
 
 	wmmon_routine(argc, argv);
 }
@@ -272,6 +278,75 @@
 void update_stat_mem(stat_dev *st, stat_dev *st2);
 void update_stat_swp(stat_dev *);
 
+#ifdef FIVAMON
+long
+get_battlife()
+{
+	static long		val, cnt = 0;
+	size_t	len;
+
+	if ((cnt++ % 40) == 0) {
+		len = sizeof(val);
+		sysctlbyname("hw.acpi.battery.life", &val, &len, NULL, 0);
+	}
+	return (val);
+}
+
+long
+get_acline()
+{
+	static long		val, cnt = 0;
+	size_t	len;
+
+	if ((cnt++ % 40) == 0) {
+		len = sizeof(val);
+		sysctlbyname("hw.acpi.acline", &val, &len, NULL, 0);
+	}
+	return (val);
+}
+
+long
+get_longrun()
+{
+	static long		val, cnt = 0;
+	size_t	len;
+
+	if ((cnt++ % 10) == 0) {
+		len = sizeof(val);
+		sysctlbyname("hw.crusoe.percentage", &val, &len, NULL, 0);
+	}
+	return (val);
+}
+
+#define KELV2C(k)	((k - 2732) / 10)
+
+long
+get_crttemp()
+{
+	long		val;
+	size_t	len;
+
+	len = sizeof(val);
+	sysctlbyname("hw.acpi.thermal.tz0._CRT", &val, &len, NULL, 0);
+	val = KELV2C(val);
+	return (val);
+}
+
+long
+get_temp()
+{
+	static long		val, cnt = 0;
+	size_t	len;
+
+	if ((cnt++ % 20) == 0) {
+		len = sizeof(val);
+		sysctlbyname("hw.acpi.thermal.tz0.temperature", &val, &len, NULL, 0);
+		val = KELV2C(val);
+	}
+	return (val);
+}
+#endif
+
 void wmmon_routine(int argc, char **argv) {
 
 	rckeys		wmmon_keys[] = {
@@ -306,6 +381,7 @@
 	long		ref_time = 0;
 	long		cnt_time;
 
+#ifndef FIVAMON
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_BOOTTIME;
 	size = sizeof(boottime);
@@ -359,6 +435,7 @@
 			fprintf( stderr, "kvm_nlist: %s\n", kvm_geterr(kvmd) );
 		}
 	}
+#endif	/* FIVAMON */
 
 	for (i=0; i<MAX_STAT_DEVICES; i++) {
 		for (j=0; j<55; j++) {
@@ -398,11 +475,13 @@
 	starttime = time(0);
 	nexttime = starttime + 10;
 
+#ifndef FIVAMON
 	for (i=0; i<stat_online; i++) {
 		get_statistics(stat_device[i].name, &k, &istat, &idle);
 		stat_device[i].statlast = istat;
 		stat_device[i].idlelast = idle;
 	}
+#endif
 	if (stat_current == 0) DrawStats(stat_device[stat_current].his, 54, 40, 5, 58);
 	if (stat_current == 1) {
 		DrawStats_io(stat_device[stat_current].his, 54, 40, 5, 58);
@@ -425,10 +504,12 @@
 		update_stat_cpu(&stat_device[0]);
 		update_stat_io(&stat_device[1]);
 
+#ifndef FIVAMON
 		if(stat_current == 2) {
 			update_stat_mem(&stat_device[2], &stat_device[3]);
 //			update_stat_swp(&stat_device[3]);
 		}
+#endif
 
 		if (stat_current < 2) {
 			i = stat_current;
@@ -449,25 +530,40 @@
 			copyXPMArea(0, 64, 32, 12, 28+64, 4);
 			copyXPMArea(0, 64, 32, 12, 28+64, 18);
 
+#ifdef FIVAMON
+			j = get_battlife();
+#else
 			j = stat_device[2].rt_idle;
 			if (j != 0) {
 				j = (stat_device[2].rt_stat * 100) / j;
 			}
+#endif
 			j = j * 0.32;
 			if (j > 32) j = 32;
 			copyXPMArea(32, 64, j, 12, 28+64, 4);
 			/*---------------------           ------------------*/
+#ifdef FIVAMON
+			j = get_acline() * 100;
+#else
 			j = stat_device[3].rt_idle;
 			if (j != 0) {
 				j = (stat_device[3].rt_stat * 100) / j;
 			}
+#endif
 			j = j * 0.32;
 			if (j > 32) j = 32;
 			copyXPMArea(32, 64, j, 12, 28+64, 18);
 
 			/*----------- online tijd neerzetten! ----------*/
 			
+#ifdef FIVAMON
+			{
+				time_t t = time(0);
+				cnt_time = timegm(localtime(&t));
+			}
+#else
 			cnt_time = time(0) - ref_time + online_time;
+#endif
 
 			/* cnt_time = uptime in seconden */
 			/*
@@ -493,14 +589,28 @@
 
 			/* De rest is dagen!  5x7*/
 			
+#ifdef FIVAMON
+			i = get_temp();
+#else
 			i = cnt_time;
+#endif
 			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 88, 35);
 			i /= 10;
 			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 82, 35);
 			i /= 10;
 			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 76, 35);
 			i /= 10;
+#ifdef FIVAMON
+			i = get_longrun();
+			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 88 + 28, 35);
+			i /= 10;
+			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 82 + 28, 35);
+			i /= 10;
+			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 76 + 28, 35);
+			i /= 10;
+#else
 			copyXPMArea(66 + (i % 10)*6, 66, 5, 7, 70, 35);
+#endif
 		}
 
 		if (curtime >= nexttime) {
@@ -590,8 +700,17 @@
 void update_stat_cpu(stat_dev *st) {
 
 	long	k, istat, idle;
+#ifdef FIVAMON
+	static long	istatsum = 0, idlesum = 0;
 
+	k = get_longrun();
+	istatsum += k;
+	idlesum += (100 - k);
+	istat = istatsum;
+	idle = idlesum;
+#else
 	get_statistics(st->name, &k, &istat, &idle);
+#endif
 
 	st->rt_idle = idle - st->idlelast;
 	st->idlelast = idle;
@@ -607,8 +726,20 @@
 
 	long			j, k, istat, idle;
 	static long		maxdiskio = 0;
+#ifdef FIVAMON
+	static long	tempsum = 0, crtsum = 0;
 
+	if (maxdiskio == 0) {
+		maxdiskio = get_crttemp();
+	}
+	k = get_temp();
+	tempsum += k;
+	crtsum += (maxdiskio - k);
+	istat = tempsum;
+	idle = crtsum;
+#else
 	get_statistics(st->name, &k, &istat, &idle);
+#endif
 
 	st->rt_idle = idle - st->idlelast;
 	st->idlelast = idle;
@@ -631,6 +762,7 @@
 	st->hisaddcnt += 1;
 }
 
+#ifndef FIVAMON
 void update_stat_mem(stat_dev *st, stat_dev *st2) {
 
 	unsigned long buffers;
@@ -1100,6 +1232,7 @@
 		if (*ds > maxdiskio) maxdiskio = *ds;
 	}
 }
+#endif	/* FIVAMON */
 
 /*******************************************************************************\
 |* checksysdevs																   *|