diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 6558453..081ab6c 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -89,6 +89,19 @@
 
                 <TextView
                         style="?android:attr/textAppearanceSmallInverse"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dip"
+                        android:text="@string/please_select_phase2" />
+
+                <Spinner android:id="@+id/phase2"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:prompt="@string/please_select_phase2"
+                        android:entries="@array/wifi_phase2_entries" />
+
+                <TextView
+                        style="?android:attr/textAppearanceSmallInverse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dip"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cdc71eb..01484f8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Rychlost připojení"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresa IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Ověření Phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certifikát CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certifikát uživatele"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identita"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 79b658a..affbb6c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Linkhastighed"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-godkendelse"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Brugercertifikat"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d811fd9..9837802 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Verbindungsgeschwindigkeit"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-Adresse"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-Methode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-Authentifizierung"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-Zertifikat"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Nutzerzertifikat"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identität"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5fe6def..c049e0b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Ταχύτητα σύνδεσης"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Διεύθυνση IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Μέθοδος EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"2η φάση ελέγχου ταυτότητας"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Πιστοποιητικό CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Πιστοποιητικό χρήστη"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Ταυτότητα"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7a7d457..54a977e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidad del vínculo"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método de EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado del usuario"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6c31327..cde10d3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidad de enlace"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Dirección IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticación de fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado de CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado de usuario"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidad"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 27abb17..0495976 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Vitesse de connexion"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adresse IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Méthode EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Authentification phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificat CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificat utilisateur"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identité"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a04dabb..a322c5f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Velocità di collegamento"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Indirizzo IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metodo EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticazione fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificato CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificato utente"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identità"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7f72a53..12d2cb0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"リンク速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IPアドレス"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP方式"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"フェーズ2認証"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA証明書"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ユーザー証明書"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b434766..4a329d6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"링크 속도"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 주소"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 방식"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"단계 2 인증"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 인증서"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"사용자 인증서"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ID"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 497863f..48e219b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Koblingshastighet"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adresse"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Fase 2-autentisering"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-sertifikat"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Klientsertifikat"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4f6c765..ae909f9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Linksnelheid"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adres"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-methode"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Phase 2-verificatie"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certificaat"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Gebruikerscertificaat"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identiteit"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 378d295..c1ed60c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Szybkość łącza"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Adres IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Metoda EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Uwierzytelnianie Phase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certyfikat urzędu certyfikacji"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certyfikat użytkownika"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Tożsamość"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8ea9896..6e0786b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidade da ligação"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"método EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do utilizador"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 476d5ed..e4f53e1 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Velocidade do link"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"Endereço IP"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Método EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autenticação da Fase 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Certificado CA"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Certificado do usuário"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identidade"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ed3a374..f128c60 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Скорость связи"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адрес"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"Метод EAP"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"2-й этап аутентификации"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"Сертификат центра сертификации"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Сертификат пользователя"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Пользователь"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b400be3..151cf9a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Länkhastighet"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP-adress"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP-metod"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Autentisering för fas 2"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA-certifikat"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Användarcertifikat"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Identitet"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index aa79d5b..4fa6d60 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"Bağlantı hızı"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP adresi"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP yöntemi"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"Aşama 2 için kimlik doğrulaması"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA sertifikası"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"Kullanıcı sertifikası"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Kimlik"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ab79aac..baa213e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"连接速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 地址"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"阶段 2 身份验证"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 证书"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"用户证书"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"身份"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 57d5f2e..5c61129 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -350,6 +350,7 @@
     <string name="wifi_speed" msgid="3526198708812322037">"連線速度"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP 位址"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP 方法"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"階段 2 驗證"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA 憑證"</string>
     <string name="wifi_eap_user_cert" msgid="1291089413368160789">"使用者憑證"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"識別"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6ab412d..16a3994 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -814,6 +814,8 @@
     <string name="wifi_ip_address">IP address</string>
     <!-- Label for the EAP method of the network -->
     <string name="wifi_eap_method">EAP method</string>
+    <!-- Label for the phase2 -->
+    <string name="please_select_phase2">Phase 2 authentication</string>
     <!-- Label for the EAP CA certificate of the network -->
     <string name="wifi_eap_ca_cert">CA certificate</string>
     <!-- Label for the EAP user certificate of the network -->
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index f85d054..a8bf717 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -60,6 +60,7 @@
 
     private Spinner mEapMethod;
     private Spinner mEapCaCert;
+    private Spinner mPhase2;
     private Spinner mEapUserCert;
     private TextView mEapIdentity;
     private TextView mEapAnonymous;
@@ -141,6 +142,9 @@
                 config.allowedKeyManagement.set(KeyMgmt.WPA_EAP);
                 config.allowedKeyManagement.set(KeyMgmt.IEEE8021X);
                 config.eap.setValue((String) mEapMethod.getSelectedItem());
+
+                config.phase2.setValue((mPhase2.getSelectedItemPosition() == 0) ? "" :
+                        "auth=" + mPhase2.getSelectedItem());
                 config.ca_cert.setValue((mEapCaCert.getSelectedItemPosition() == 0) ? "" :
                         KEYSTORE_SPACE + Credentials.CA_CERTIFICATE +
                         (String) mEapCaCert.getSelectedItem());
@@ -302,6 +306,7 @@
 
         if (mEapMethod == null) {
             mEapMethod = (Spinner) mView.findViewById(R.id.method);
+            mPhase2 = (Spinner) mView.findViewById(R.id.phase2);
             mEapCaCert = (Spinner) mView.findViewById(R.id.ca_cert);
             mEapUserCert = (Spinner) mView.findViewById(R.id.user_cert);
             mEapIdentity = (TextView) mView.findViewById(R.id.identity);
@@ -313,6 +318,7 @@
             if (mAccessPoint != null && mAccessPoint.networkId != -1) {
                 WifiConfiguration config = mAccessPoint.getConfig();
                 setSelection(mEapMethod, config.eap.value());
+                setSelection(mPhase2, config.phase2.value());
                 setCertificate(mEapCaCert, Credentials.CA_CERTIFICATE,
                         config.ca_cert.value());
                 setCertificate(mEapUserCert, Credentials.USER_PRIVATE_KEY,