diff --git a/CHANGELOG.md b/CHANGELOG.md
index 590094e3..f0917a47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+- Customize host endpoint.
+
 ## 1.11.3 (2020-05-21)
 
 ### Added
diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift
index b0121253..cbc55759 100644
--- a/Passepartout-iOS/Scenes/ServiceViewController.swift
+++ b/Passepartout-iOS/Scenes/ServiceViewController.swift
@@ -908,7 +908,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
 
             let V = L10n.Core.Global.Values.self
             if let provider = profile as? ProviderConnectionProfile {
-                cell.rightText = provider.usesProviderEndpoint ? V.manual : V.automatic
+                cell.rightText = provider.usesCustomEndpoint ? V.manual : V.automatic
             } else {
                 cell.rightText = profile?.mainAddress
             }
@@ -1424,10 +1424,9 @@ extension ServiceViewController: AccountViewControllerDelegate {
 
 extension ServiceViewController: EndpointViewControllerDelegate {
     func endpointController(_: EndpointViewController, didUpdateWithNewAddress newAddress: String?, newProtocol: EndpointProtocol?) {
-        if let providerProfile = profile as? ProviderConnectionProfile {
-            providerProfile.manualAddress = newAddress
-            providerProfile.manualProtocol = newProtocol
-        }
+        profile?.customAddress = newAddress
+        profile?.customProtocol = newProtocol
+
         reloadSelectedRow()
     }
 }
diff --git a/Submodules/Core b/Submodules/Core
index d3609e11..26431df4 160000
--- a/Submodules/Core
+++ b/Submodules/Core
@@ -1 +1 @@
-Subproject commit d3609e117a47e1132fa70f2a2bd72768ef5e6587
+Subproject commit 26431df4a4d189f45e2892c8fab4268e48c2f7f4