diff --git a/asminc/c128.inc b/asminc/c128.inc
index e6c89b07b..9e9acc5a8 100644
--- a/asminc/c128.inc
+++ b/asminc/c128.inc
@@ -38,6 +38,10 @@ INIT_STATUS     := $A04         ; Flags: Reset/Restore initiation status
 FKEY_LEN        := $1000        ; Function key lengths
 FKEY_TEXT       := $100A        ; Function key texts
 
+KBDREPEAT       := $28a
+KBDREPEATRATE   := $28b
+KBDREPEATDELAY  := $28c
+
 ; ---------------------------------------------------------------------------
 ; Kernal routines
 
diff --git a/asminc/c64.inc b/asminc/c64.inc
index ababb1ea0..00b66a64f 100644
--- a/asminc/c64.inc
+++ b/asminc/c64.inc
@@ -33,6 +33,9 @@ CHARCOLOR       := $286
 CURS_COLOR      := $287         ; Color under the cursor
 PALFLAG         := $2A6         ; $01 = PAL, $00 = NTSC
 
+KBDREPEAT       := $28a
+KBDREPEATRATE   := $28b
+KBDREPEATDELAY  := $28c
 
 ; ---------------------------------------------------------------------------
 ; Kernal routines
diff --git a/asminc/pet.inc b/asminc/pet.inc
index a745a89c8..8f2f469e0 100644
--- a/asminc/pet.inc
+++ b/asminc/pet.inc
@@ -31,6 +31,18 @@ BASIC_BUF_LEN   = 81            ; Maximum length of command-line
 
 KEY_BUF         := $26F         ; Keyboard buffer
 
+;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 69b2298a3..3b2f08c54 100644
--- a/asminc/plus4.inc
+++ b/asminc/plus4.inc
@@ -33,6 +33,10 @@ FKEY_COUNT      := $55D         ; Characters for function key
 FKEY_SPACE      := $55F         ; Function key definitions
 FKEY_ORIG       := $F3D2        ; Original definitions
 
+KBDREPEAT       := $540
+KBDREPEATRATE   := $541
+KBDREPEATDELAY  := $542
+
 ; ---------------------------------------------------------------------------
 ; Kernal routines
 
diff --git a/asminc/vic20.inc b/asminc/vic20.inc
index 12424dc11..d882eb1ad 100644
--- a/asminc/vic20.inc
+++ b/asminc/vic20.inc
@@ -31,6 +31,9 @@ BASIC_BUF_LEN   = 89            ; Maximum length of command-line
 CHARCOLOR       := $286
 CURS_COLOR      := $287         ; Color under the cursor
 
+KBDREPEAT       := $28a
+KBDREPEATRATE   := $28b
+KBDREPEATDELAY  := $28c
 
 ; ---------------------------------------------------------------------------
 ; Screen size
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 14113cbab..f866dea5f 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -183,6 +183,9 @@ function.
 <!-- <item><ref id="cbm_save" name="cbm_save"> -->
 <!-- <item><ref id="cbm_write" name="cbm_write"> -->
 <!-- <item><ref id="get_tv" name="get_tv"> -->
+<item><ref id="kbrepeat" name="kbrepeat">
+<item><ref id="kbrepeatdelay" name="kbrepeatdelay">
+<item><ref id="kbrepeatrate" name="kbrepeatrate">
 </itemize>
 
 (incomplete)
@@ -2165,6 +2168,73 @@ to get off the serial bus so it can be used for other purposes.
 </descrip>
 </quote>
 
+<sect1>kbrepeat<label id="kbrepeat"><p>
+
+<quote>
+<descrip>
+<tag/Function/Set keyboard repeat mode
+<tag/Header/<tt/<ref id="cbm.h" name="cbm.h">/
+<tag/Declaration/<tt/unsigned char kbrepeat (unsigned char);/
+<tag/Description/This function changes what keys will have automatic repeat when
+being hold down for a certain time. Possible values are KBDREPEAT_CURSOR (repeat
+only cursor-related keys), KBDREPEAT_NONE (no repeat for any keys) and 
+KBDREPEAT_ALL (repeat all keys).
+The old mode is returned so it can be restored later.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="kbrepeatdelay" name="kbrepeatdelay">
+<ref id="kbrepeatrate" name="kbrepeatrate">
+<tag/Example/None.
+</descrip>
+</quote>
+
+<sect1>kbrepeatdelay<label id="kbrepeatdelay"><p>
+
+<quote>
+<descrip>
+<tag/Function/Set keyboard repeat delay
+<tag/Header/<tt/<ref id="cbm.h" name="cbm.h">/
+<tag/Declaration/<tt/unsigned char kbrepeatdelay (unsigned char);/
+<tag/Description/This function changes the delay until a keypress is being
+repeated automatically.
+The old value is returned so it can be restored later.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="kbrepeat" name="kbrepeat">
+<ref id="kbrepeatrate" name="kbrepeatrate">
+<tag/Example/None.
+</descrip>
+</quote>
+
+<sect1>kbrepeatrate<label id="kbrepeatrate"><p>
+
+<quote>
+<descrip>
+<tag/Function/Set keyboard repeat rate
+<tag/Header/<tt/<ref id="cbm.h" name="cbm.h">/
+<tag/Declaration/<tt/unsigned char kbrepeatrate (unsigned char);/
+<tag/Description/This function changes the keyboard repeat rate (the time between
+repeated keypresses).
+The old value is returned so it can be restored later.
+<tag/Notes/<itemize>
+<item>The function is available only as a fastcall function; so, it may be used
+only in the presence of a prototype.
+</itemize>
+<tag/Availability/cc65
+<tag/See also/
+<ref id="kbrepeat" name="kbrepeat">
+<ref id="kbrepeatdelay" name="kbrepeatdelay">
+<tag/Example/None.
+</descrip>
+</quote>
 
 <sect1>cclear<label id="cclear"><p>
 
diff --git a/include/cbm.h b/include/cbm.h
index 129b0295b..c1762b1a9 100644
--- a/include/cbm.h
+++ b/include/cbm.h
@@ -158,6 +158,14 @@ struct cbm_dirent {
 unsigned char get_tv (void);
 /* Return the video mode the machine is using. */
 
+#define KBDREPEAT_CURSOR 0x00
+#define KBDREPEAT_NONE   0x40
+#define KBDREPEAT_ALL    0x80
+
+unsigned char __fastcall__ kbrepeat(unsigned char);
+unsigned char __fastcall__ kbrepeatdelay(unsigned char);
+unsigned char __fastcall__ kbrepeatrate(unsigned char);
+
 #if !defined(__CBM610__) && !defined(__PET__)
 void waitvsync (void);
 /* wait for the start of the next frame */
diff --git a/libsrc/c128/kbrepeat.s b/libsrc/c128/kbrepeat.s
new file mode 100644
index 000000000..c32e8c017
--- /dev/null
+++ b/libsrc/c128/kbrepeat.s
@@ -0,0 +1,22 @@
+
+        .export _kbrepeat, _kbrepeatdelay, _kbrepeatrate
+
+        .include        "c128.inc"
+
+_kbrepeat:
+        ldx KBDREPEAT           ; get old value
+        sta KBDREPEAT           ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatdelay:
+        ldx KBDREPEATDELAY      ; get old value
+        sta KBDREPEATDELAY      ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatrate:
+        ldx KBDREPEATRATE       ; get old value
+        sta KBDREPEATRATE       ; store new value
+        txa                     ; return old value
+        rts
diff --git a/libsrc/c64/kbrepeat.s b/libsrc/c64/kbrepeat.s
new file mode 100644
index 000000000..f59c8a6da
--- /dev/null
+++ b/libsrc/c64/kbrepeat.s
@@ -0,0 +1,22 @@
+
+        .export _kbrepeat, _kbrepeatdelay, _kbrepeatrate
+
+        .include        "c64.inc"
+
+_kbrepeat:
+        ldx KBDREPEAT           ; get old value
+        sta KBDREPEAT           ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatdelay:
+        ldx KBDREPEATDELAY      ; get old value
+        sta KBDREPEATDELAY      ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatrate:
+        ldx KBDREPEATRATE       ; get old value
+        sta KBDREPEATRATE       ; store new value
+        txa                     ; return old value
+        rts
diff --git a/libsrc/pet/kbrepeat.s b/libsrc/pet/kbrepeat.s
new file mode 100644
index 000000000..0a29d7420
--- /dev/null
+++ b/libsrc/pet/kbrepeat.s
@@ -0,0 +1,22 @@
+
+        .export _kbrepeat, _kbrepeatdelay, _kbrepeatrate
+
+        .include        "pet.inc"
+
+_kbrepeat:
+        ldx KBDREPEAT           ; get old value
+        sta KBDREPEAT           ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatdelay:
+        ldx KBDREPEATDELAY      ; get old value
+        sta KBDREPEATDELAY      ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatrate:
+        ldx KBDREPEATRATE       ; get old value
+        sta KBDREPEATRATE       ; store new value
+        txa                     ; return old value
+        rts
diff --git a/libsrc/plus4/kbrepeat.s b/libsrc/plus4/kbrepeat.s
new file mode 100644
index 000000000..927b99e5b
--- /dev/null
+++ b/libsrc/plus4/kbrepeat.s
@@ -0,0 +1,22 @@
+
+        .export _kbrepeat, _kbrepeatdelay, _kbrepeatrate
+
+        .include        "plus4.inc"
+
+_kbrepeat:
+        ldx KBDREPEAT           ; get old value
+        sta KBDREPEAT           ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatdelay:
+        ldx KBDREPEATDELAY      ; get old value
+        sta KBDREPEATDELAY      ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatrate:
+        ldx KBDREPEATRATE       ; get old value
+        sta KBDREPEATRATE       ; store new value
+        txa                     ; return old value
+        rts
diff --git a/libsrc/vic20/kbrepeat.s b/libsrc/vic20/kbrepeat.s
new file mode 100644
index 000000000..5115c852e
--- /dev/null
+++ b/libsrc/vic20/kbrepeat.s
@@ -0,0 +1,22 @@
+
+        .export _kbrepeat, _kbrepeatdelay, _kbrepeatrate
+
+        .include        "vic20.inc"
+
+_kbrepeat:
+        ldx KBDREPEAT           ; get old value
+        sta KBDREPEAT           ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatdelay:
+        ldx KBDREPEATDELAY      ; get old value
+        sta KBDREPEATDELAY      ; store new value
+        txa                     ; return old value
+        rts
+
+_kbrepeatrate:
+        ldx KBDREPEATRATE       ; get old value
+        sta KBDREPEATRATE       ; store new value
+        txa                     ; return old value
+        rts