--- strongarm.module.orig	2010-12-29 18:50:46.000000000 +0100
+++ strongarm.module	2010-12-29 18:50:29.000000000 +0100
@@ -6,6 +6,7 @@
  */
 function strongarm_init() {
   strongarm_set_conf();
+  include_once('includes/locale.inc');
   // This is a workaround for the very early check of the 'site_frontpage'
   // variable in the Drupal bootstrap process. The workaround re-runs
   // drupal_path_initialize() to ensure the strongarm'ed version of
@@ -13,6 +14,15 @@ function strongarm_init() {
   // weighted even lower than strongarm (which is a superlightweight -1000)
   // rely on $_GET['q'] or 'site_frontpage' in hook_init().
   $_GET['q'] = request_path();
+
+  // The above workaround conflicts with the language prefix language selection
+  // method because it reintroduces the path prefix which had previously been
+  // removed by locale_language_from_url(). Calling that function again
+  // removes the prefix again.
+  if (language_negotiation_get_any(LOCALE_LANGUAGE_NEGOTIATION_URL)) {
+    $languages = language_list('enabled');
+    locale_language_from_url($languages[1]);
+  }
   drupal_path_initialize();
 }