diff --git a/asminc/pet.inc b/asminc/pet.inc
index ea6eef2e0..8f2f469e0 100644
--- a/asminc/pet.inc
+++ b/asminc/pet.inc
@@ -31,10 +31,17 @@ BASIC_BUF_LEN   = 81            ; Maximum length of command-line
 
 KEY_BUF         := $26F         ; Keyboard buffer
 
-;FIXME: these are wrong?
-KBDREPEAT       := $28a
-KBDREPEATRATE   := $28b
-KBDREPEATDELAY  := $28c
+;FIXME: we must somehow handle the difference between the two - how?
+
+; 40-Column PETs
+;KBDREPEAT       := $3ee
+;KBDREPEATRATE   := $3ea
+;KBDREPEATDELAY  := $3e9
+
+; 80-Column PETs
+KBDREPEAT       := $e4
+KBDREPEATRATE   := $e5
+KBDREPEATDELAY  := $e6
 
 ;----------------------------------------------------------------------------
 ; PET ROM type detection
diff --git a/asminc/plus4.inc b/asminc/plus4.inc
index 42ed314bd..3b2f08c54 100644
--- a/asminc/plus4.inc
+++ b/asminc/plus4.inc
@@ -33,10 +33,9 @@ FKEY_COUNT      := $55D         ; Characters for function key
 FKEY_SPACE      := $55F         ; Function key definitions
 FKEY_ORIG       := $F3D2        ; Original definitions
 
-;FIXME: he?! these ok? :o)
-KBDREPEAT       := $28a
-KBDREPEATRATE   := $28b
-KBDREPEATDELAY  := $28c
+KBDREPEAT       := $540
+KBDREPEATRATE   := $541
+KBDREPEATDELAY  := $542
 
 ; ---------------------------------------------------------------------------
 ; Kernal routines