diff --git a/ChangeLog b/ChangeLog
index 49406db1..5dbe55cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 CVS code -
+- General
+	- Add Meta-A as alternate keyystroke for ^^ for people with
+	  non-US keyboards.
 - nano.c:
   usage()
   	- Remove extra \n in --keypad description (Jordi).
diff --git a/global.c b/global.c
index 09b844e8..b99f0109 100644
--- a/global.c
+++ b/global.c
@@ -407,7 +407,7 @@ void shortcut_init(int unjustify)
 		nano_refresh_msg, 0, 0, 0, VIEW, total_refresh);
 
     sc_init_one(&main_list[19], NANO_MARK_KEY, _("Mark Text"),
-		nano_mark_msg, 0, 0, 0, NOVIEW, do_mark);
+		nano_mark_msg, NANO_ALT_MARK_KEY, 0, 0, NOVIEW, do_mark);
 
     sc_init_one(&main_list[20], NANO_DELETE_KEY, _("Delete"),
 		nano_delete_msg, 0, KEY_DC,
@@ -423,7 +423,7 @@ void shortcut_init(int unjustify)
     if (ISSET(PICO_MODE))
 	sc_init_one(&main_list[23], NANO_REPLACE_KEY, _("Replace"),
 		    nano_replace_msg,
-		    NANO_ALT_R, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
+		    NANO_ALT_REPLACE_KEY, NANO_REPLACE_FKEY, 0, NOVIEW, do_replace);
     else
 	sc_init_one(&main_list[23], NANO_JUSTIFY_KEY, _("Justify"),
 		    nano_justify_msg, 0, NANO_JUSTIFY_FKEY, 0,
diff --git a/nano.h b/nano.h
index e7175fb6..dd585d1b 100644
--- a/nano.h
+++ b/nano.h
@@ -277,6 +277,7 @@ know what you're doing */
 #define NANO_FORWARD_KEY	NANO_CONTROL_F
 #define NANO_BACK_KEY		NANO_CONTROL_B
 #define NANO_MARK_KEY		NANO_CONTROL_6
+#define NANO_ALT_MARK_KEY	NANO_ALT_A
 #define NANO_HOME_KEY		NANO_CONTROL_A
 #define NANO_END_KEY		NANO_CONTROL_E
 #define NANO_DELETE_KEY		NANO_CONTROL_D