Index: modules/path/path.module
===================================================================
--- modules/path/path.module	(revision 909)
+++ modules/path/path.module	(working copy)
@@ -105,7 +105,7 @@
     if ($alias == drupal_get_path_alias($path, $language)) {
       // There is already such an alias, neutral or in this language.
       // Update the alias based on alias; setting the language if not yet done.
-      db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE dst = '%s'", $path, $alias, $language, $alias);
+      db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE dst = '%s' AND language = '%s'", $path, $alias, $language, $alias, $language);
     }
     else {
       // A new alias. Add it to the database.
@@ -115,10 +115,20 @@
   else {
     // Delete the alias.
     if ($alias) {
-      db_query("DELETE FROM {url_alias} WHERE dst = '%s'", $alias);
+      if ($language) {
+        db_query("DELETE FROM {url_alias} WHERE dst = '%s' AND language = '%s'", $alias, $language);
+      }
+      else {
+        db_query("DELETE FROM {url_alias} WHERE dst = '%s'", $alias);
+      }
     }
     else {
-      db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
+      if ($language) {
+        db_query("DELETE FROM {url_alias} WHERE src = '%s' AND language = '%s'", $path, $language);
+      }
+      else {
+        db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
+      }
     }
   }
   drupal_clear_path_cache();
@@ -168,7 +178,7 @@
       case 'delete':
         $path = 'node/'. $node->nid;
         if (drupal_get_path_alias($path) != $path) {
-          path_set_alias($path);
+          path_set_alias($path, NULL, NULL, $language);
         }
         break;
     }