diff --git a/clusterssh/ChangeLog b/clusterssh/ChangeLog
index 7f5b1c2..2b0400f 100644
--- a/clusterssh/ChangeLog
+++ b/clusterssh/ChangeLog
@@ -15,6 +15,7 @@
 * Increase reserve of screen from bottom from 40 pixels to 60
 * Better notes in docs for screen/terminal reserving
 * Minor fixup to docs formatting
+* Correct pasting mechanism into control window
 
 2009-03-26 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.25-1
 
diff --git a/clusterssh/src/cssh.pl b/clusterssh/src/cssh.pl
index cfa8b96..616a4e6 100755
--- a/clusterssh/src/cssh.pl
+++ b/clusterssh/src/cssh.pl
@@ -483,24 +483,14 @@ sub load_keyboard_map() {
     logmsg( 1, "Loading keymaps and keycodes" );
 
     foreach ( 0 .. $#keyboard ) {
-        if ( defined $keyboard[$_][0] ) {
-            if ( defined( $keycodetosym{ $keyboard[$_][0] } ) ) {
-                $keyboardmap{ $keycodetosym{ $keyboard[$_][0] } }
-                    = 'n' . ( $_ + $min );
+        if ( defined $keyboard[$_][3] ) {
+            if ( defined( $keycodetosym{ $keyboard[$_][3] } ) ) {
+                $keyboardmap{ $keycodetosym{ $keyboard[$_][3] } }
+                    = 'sa' . ( $_ + $min );
             }
             else {
-                logmsg( 2, "Unknown keycode ", $keyboard[$_][0] )
-                    if ( $keyboard[$_][0] != 0 );
-            }
-        }
-        if ( defined $keyboard[$_][1] ) {
-            if ( defined( $keycodetosym{ $keyboard[$_][1] } ) ) {
-                $keyboardmap{ $keycodetosym{ $keyboard[$_][1] } }
-                    = 's' . ( $_ + $min );
-            }
-            else {
-                logmsg( 2, "Unknown keycode ", $keyboard[$_][1] )
-                    if ( $keyboard[$_][1] != 0 );
+                logmsg( 2, "Unknown keycode ", $keyboard[$_][3] )
+                    if ( $keyboard[$_][3] != 0 );
             }
         }
         if ( defined $keyboard[$_][2] ) {
@@ -513,14 +503,24 @@ sub load_keyboard_map() {
                     if ( $keyboard[$_][2] != 0 );
             }
         }
-        if ( defined $keyboard[$_][3] ) {
-            if ( defined( $keycodetosym{ $keyboard[$_][3] } ) ) {
-                $keyboardmap{ $keycodetosym{ $keyboard[$_][3] } }
-                    = 'sa' . ( $_ + $min );
+        if ( defined $keyboard[$_][1] ) {
+            if ( defined( $keycodetosym{ $keyboard[$_][1] } ) ) {
+                $keyboardmap{ $keycodetosym{ $keyboard[$_][1] } }
+                    = 's' . ( $_ + $min );
             }
             else {
-                logmsg( 2, "Unknown keycode ", $keyboard[$_][3] )
-                    if ( $keyboard[$_][3] != 0 );
+                logmsg( 2, "Unknown keycode ", $keyboard[$_][1] )
+                    if ( $keyboard[$_][1] != 0 );
+            }
+        }
+        if ( defined $keyboard[$_][0] ) {
+            if ( defined( $keycodetosym{ $keyboard[$_][0] } ) ) {
+                $keyboardmap{ $keycodetosym{ $keyboard[$_][0] } }
+                    = 'n' . ( $_ + $min );
+            }
+            else {
+                logmsg( 2, "Unknown keycode ", $keyboard[$_][0] )
+                    if ( $keyboard[$_][0] != 0 );
             }
         }