diff -ru gkrellm-pmu-0.12.orij/README gkrellm-pmu-0.12/README
--- gkrellm-pmu-0.12.orij/README	Sun Jun  4 18:04:56 2000
+++ gkrellm-pmu-0.12/README	Tue Jun  6 15:20:31 2000
@@ -2,8 +2,8 @@
 
 This is fairly straight forward. 
 Works on my PDQ/300 almost perfectly.  known to work on lombard.  Ohare
-(used in 2400/3400/3500s) and Keylargo (iBook?) are supported but I have not
-been able to test them yet.  Pismo status is unknown. 
+(used in 2400/3400/3500s) and Keylargo (iBook and Pismo) are supported
+and reportedly working, but I have not personally tested them yet.  
 
 The location and decal pixmap can be changed with ease from pmu_user.h.
 As of 0.10.0, the pmu_user.h only effects location.  Decals can only be
@@ -27,9 +27,7 @@
 than enough.  Demand?
 
 Known bugs and future ideas im thinking about:
-   - Ohare support 
-   - Keylargo support 
-   - Pismo (whatever it uses, I don't know.  Keylargo-esqe from what I read)
+   - test Ohare support 
 
 Since I can't test all systems myself, if you want your system supported, 
 please email me with any info on your system.
diff -ru gkrellm-pmu-0.12.orij/gkrellm-pmu.spec gkrellm-pmu-0.12/gkrellm-pmu.spec
--- gkrellm-pmu-0.12.orij/gkrellm-pmu.spec	Fri Jun  2 15:48:58 2000
+++ gkrellm-pmu-0.12/gkrellm-pmu.spec	Tue Jun  6 15:37:10 2000
@@ -1,11 +1,12 @@
 Summary: PMU for GKrellM
 Name: gkrellm-pmu
 Version: 0.12
-Release: 1
+Release: 2
 Copyright: GPL
 Vendor: Joseph Garcia <jpgarcia@execpc.com>
 Group: X11/Utilities
 Source: gkrellm-pmu-0.12.tar.gz
+Patch: gkrellm-pmu-0.12-2.patch
 BuildRoot: /var/tmp/pmu-BUILD
 Requires: gkrellm >= 0.9.9
 Obsoletes: gkrellm_pmu
@@ -22,6 +23,7 @@
 
 %prep
 %setup 
+%patch -p1
 
 %build
 make
diff -ru gkrellm-pmu-0.12.orij/src/gkrellm-pmu.c gkrellm-pmu-0.12/src/gkrellm-pmu.c
--- gkrellm-pmu-0.12.orij/src/gkrellm-pmu.c	Mon Jun  5 00:01:35 2000
+++ gkrellm-pmu-0.12/src/gkrellm-pmu.c	Tue Jun  6 15:30:33 2000
@@ -37,7 +37,7 @@
      N_("2400/3400/3500 (untested)"),	// 9
      N_("G3 Wallstreet/PDQ"),	// 10
      N_("1999 G3 Lombard"),	// 11
-     N_("iBook (untested)"),	// 12
+     N_("iBook or Pismo"),	// 12
      N_("something nice (but unsupported)")	// > 12
 };
 
@@ -82,8 +82,8 @@
      }
 
      switch (sys_pmu.version = vers) {
-	  case PMU_VERSION_WALLSTREET:
-	  case PMU_VERSION_LOMBARD:
+	  case PMU_VERSION_HEATHROW:
+	  case PMU_VERSION_PADDINGTON:
 	  sys_pmu.nbattery = 2;
 	  sys_pmu.read_pmu = read_g3_pmu;
 	  break;
@@ -92,7 +92,7 @@
 	  sys_pmu.read_pmu = read_ohare_pmu;
 	  break;
 	  case PMU_VERSION_KEYLARGO:
-	  sys_pmu.nbattery = 1;
+	  sys_pmu.nbattery = 2;
 	  sys_pmu.read_pmu = read_g3_pmu;
 	  break;
 	  case PMU_VERSION_NONE:	//NO PMUD
@@ -103,8 +103,8 @@
 	  return;
 	  default:	//UNSUPPORTED or UNKNOWN
 	  sprintf (sys_pmu.pmu_info,
-	       _("PMUD: %.1f   Model: %s\n\nUNSUPPORTED\nPlease contact Joseph Garcia <jpgarcia@execpc.com>\nto see about supporting this system."),
-	       pmud_ver, model[(vers < 13) ? vers : 13], 0);
+	       _("PMUD: %.1f   Model ID: %i\n\nUNSUPPORTED\nPlease contact Joseph Garcia <jpgarcia@execpc.com>\nto see about supporting this system."),
+	       pmud_ver, vers);
 	  sys_pmu.nbattery = 0;
 	  sys_pmu.read_pmu = 0;
 	  return;
diff -ru gkrellm-pmu-0.12.orij/src/gkrellm-pmu.h gkrellm-pmu-0.12/src/gkrellm-pmu.h
--- gkrellm-pmu-0.12.orij/src/gkrellm-pmu.h	Mon Jun  5 00:01:04 2000
+++ gkrellm-pmu-0.12/src/gkrellm-pmu.h	Tue Jun  6 15:31:28 2000
@@ -30,9 +30,9 @@
 #define GKRELLM_PMU_VERSION_MAJOR 0
 #define GKRELLM_PMU_VERSION_MINOR 12
 #if USE_NEW_STYLE
-#define GKRELLM_PMU_VERSION_TYPE  "\nCompiled for GKrellM 0.10.x"
+#define GKRELLM_PMU_VERSION_TYPE  "-2\nCompiled for GKrellM 0.10.x"
 #else
-#define GKRELLM_PMU_VERSION_TYPE  ""
+#define GKRELLM_PMU_VERSION_TYPE  "-2"
 #endif
 
 typedef struct {
@@ -80,8 +80,8 @@
 
 /* maybe pmud.h should go public?  like /usr/include/pmud/pmud.h */
 #define PMU_VERSION_OHARE	    9
-#define PMU_VERSION_WALLSTREET	10
-#define PMU_VERSION_LOMBARD	    11
+#define PMU_VERSION_HEATHROW	10
+#define PMU_VERSION_PADDINGTON	    11
 #define PMU_VERSION_KEYLARGO	12
 
 #define PMU_CONFIG_KEYWORD "pmu"