diff --git a/Remora.Rest.Core/Optional.cs b/Remora.Rest.Core/Optional.cs
index df81341..22fa68f 100644
--- a/Remora.Rest.Core/Optional.cs
+++ b/Remora.Rest.Core/Optional.cs
@@ -152,7 +152,7 @@ public bool TryGet([MaybeNullWhen(false)] out TValue value)
     /// Applies a mapping function to the value of the <see cref="Optional{TValue}"/> if it has one; otherwise, returns
     /// a new <see cref="Optional{TValue}"/> of the resulting type with no value.
     /// </summary>
-    /// <param name="mappingFunc">The mapping function.</param>
+    /// <param name="mappingFunc">The mapping function, returning <typeparamref name="TResult" />.</param>
     /// <typeparam name="TResult">The value type for the output of the mapping result.</typeparam>
     /// <returns>
     /// A new optional with the mapping result if <see cref="Optional{TValue}"/> has a value; an optional with no value
@@ -165,6 +165,23 @@ public Optional<TResult> Map<TResult>(Func<TValue, TResult> mappingFunc)
             : default(Optional<TResult>);
     }
 
+    /// <summary>
+    /// Applies a mapping function to the value of the <see cref="Optional{TValue}"/> if it has one; otherwise, returns
+    /// a new <see cref="Optional{TValue}"/> of the resulting type with no value.
+    /// </summary>
+    /// <param name="mappingFunc">The mapping function, returning <see cref="Optional{TValue}"/>.</param>
+    /// <typeparam name="TResult">The value type for the output of the mapping result.</typeparam>
+    /// <returns>
+    /// A new optional with the mapping result if <see cref="Optional{TValue}"/> has a value; an optional with no value
+    /// otherwise.
+    /// </returns>
+    public Optional<TResult> FlatMap<TResult>(Func<TValue, Optional<TResult>> mappingFunc)
+    {
+        return this.HasValue
+            ? mappingFunc(_value)
+            : default;
+    }
+
     /// <summary>
     /// Implicitly converts actual values into an optional.
     /// </summary>
diff --git a/Tests/Remora.Rest.Core.Tests/Optional/OptionalTests.cs b/Tests/Remora.Rest.Core.Tests/Optional/OptionalTests.cs
index 40808be..64e69f8 100644
--- a/Tests/Remora.Rest.Core.Tests/Optional/OptionalTests.cs
+++ b/Tests/Remora.Rest.Core.Tests/Optional/OptionalTests.cs
@@ -734,6 +734,27 @@ public static void ReturnsOptionalWithNoValueIfInputHasNoValue()
         }
     }
 
+    public static class FlatMap
+    {
+        private static Optional<int> ParseInt(string s) => int.TryParse(s, out int i) ? i : default(Optional<int>);
+
+        [Fact]
+        public static void CanFlatMap()
+        {
+            Optional<string> one = "1";
+            var flatMapped = one.FlatMap(ParseInt);
+            Assert.Equal(new Optional<int>(1), flatMapped);
+        }
+
+        [Fact]
+        public static void ReturnsOptionalWithNoValueIfInputHasNoValue()
+        {
+            var a = default(Optional<string>);
+            var flatMapped = a.FlatMap(ParseInt);
+            Assert.False(flatMapped.HasValue);
+        }
+    }
+
     public static class ConvertNullToEmpty
     {
         public static class Struct