diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
index 8adaacd46b..bd358047aa 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -133,6 +133,8 @@ public abstract class IpAdapterParserUtils {
 
 	public static final String CONNECT_TIMEOUT = "connect-timeout";
 
+	public static final String UDP_SOCKET_CUSTOMIZER = "socket-customizer";
+
 	private IpAdapterParserUtils() {
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java
index d7ec431b79..4f1637016f 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,8 @@ public class UdpInboundChannelAdapterParser extends AbstractChannelAdapterParser
 				IpAdapterParserUtils.TASK_EXECUTOR);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				IpAdapterParserUtils.LOOKUP_HOST);
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
+				IpAdapterParserUtils.UDP_SOCKET_CUSTOMIZER);
 		return builder.getBeanDefinition();
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpOutboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpOutboundChannelAdapterParser.java
index 7c09af1f1d..7789ecfd21 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpOutboundChannelAdapterParser.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpOutboundChannelAdapterParser.java
@@ -35,6 +35,7 @@ import org.springframework.util.StringUtils;
  */
 public class UdpOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
 
+	@Override
 	protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
 		BeanDefinitionBuilder builder = parseUdp(element, parserContext);
 		IpAdapterParserUtils.addCommonSocketOptions(builder, element);
@@ -84,6 +85,8 @@ public class UdpOutboundChannelAdapterParser extends AbstractOutboundChannelAdap
 				IpAdapterParserUtils.TASK_EXECUTOR);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element,
 				"socket-expression", "socketExpressionString");
+		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element,
+				IpAdapterParserUtils.UDP_SOCKET_CUSTOMIZER);
 		return builder;
 	}
 
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractUdpOutboundChannelAdapterSpec.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractUdpOutboundChannelAdapterSpec.java
index e3aa00c6e8..6024c8ea45 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractUdpOutboundChannelAdapterSpec.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractUdpOutboundChannelAdapterSpec.java
@@ -21,6 +21,7 @@ import java.util.function.Function;
 
 import org.springframework.integration.dsl.MessageHandlerSpec;
 import org.springframework.integration.expression.FunctionExpression;
+import org.springframework.integration.ip.udp.SocketCustomizer;
 import org.springframework.integration.ip.udp.UnicastSendingMessageHandler;
 import org.springframework.messaging.Message;
 
@@ -133,4 +134,15 @@ public abstract class AbstractUdpOutboundChannelAdapterSpec<S extends AbstractUd
 		return _this();
 	}
 
+	/**
+	 * Configure the socket.
+	 * @param customizer the customizer.
+	 * @return the spec.
+	 * @since 5.3.3
+	 */
+	public S configureSocket(SocketCustomizer customizer) {
+		this.target.setSocketCustomizer(customizer);
+		return _this();
+	}
+
 }
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpInboundChannelAdapterSpec.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpInboundChannelAdapterSpec.java
index 009f3926c5..f7b40f5a55 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpInboundChannelAdapterSpec.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/UdpInboundChannelAdapterSpec.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Executor;
 
 import org.springframework.integration.dsl.MessageProducerSpec;
 import org.springframework.integration.ip.udp.MulticastReceivingChannelAdapter;
+import org.springframework.integration.ip.udp.SocketCustomizer;
 import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
 import org.springframework.scheduling.TaskScheduler;
 
@@ -50,7 +51,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec soTimeout(int soTimeout) {
 		this.target.setSoTimeout(soTimeout);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -60,7 +61,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec taskScheduler(TaskScheduler taskScheduler) {
 		this.target.setTaskScheduler(taskScheduler);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -70,7 +71,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec soReceiveBufferSize(int soReceiveBufferSize) {
 		this.target.setSoReceiveBufferSize(soReceiveBufferSize);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -80,7 +81,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec receiveBufferSize(int receiveBufferSize) {
 		this.target.setReceiveBufferSize(receiveBufferSize);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -90,7 +91,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec lengthCheck(boolean lengthCheck) {
 		this.target.setLengthCheck(lengthCheck);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -100,7 +101,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec localAddress(String localAddress) {
 		this.target.setLocalAddress(localAddress);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -110,7 +111,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec poolSize(int poolSize) {
 		this.target.setPoolSize(poolSize);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -120,7 +121,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec taskExecutor(Executor taskExecutor) {
 		this.target.setTaskExecutor(taskExecutor);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -130,7 +131,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec socket(DatagramSocket socket) {
 		this.target.setSocket(socket);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -140,7 +141,7 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec soSendBufferSize(int soSendBufferSize) {
 		this.target.setSoSendBufferSize(soSendBufferSize);
-		return _this();
+		return this;
 	}
 
 	/**
@@ -150,7 +151,18 @@ public class UdpInboundChannelAdapterSpec
 	 */
 	public UdpInboundChannelAdapterSpec lookupHost(boolean lookupHost) {
 		this.target.setLookupHost(lookupHost);
-		return _this();
+		return this;
+	}
+
+	/**
+	 * Configure the socket.
+	 * @param customizer the customizer.
+	 * @return the spec.
+	 * @since 5.3.3
+	 */
+	public UdpInboundChannelAdapterSpec configureSocket(SocketCustomizer customizer) {
+		this.target.setSocketCustomizer(customizer);
+		return this;
 	}
 
 }
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/package-info.java
index f93424236d..ec6063a0ea 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/package-info.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/package-info.java
@@ -1,4 +1,5 @@
 /**
  * Provides TCP/UDP Component support for the Java DSL.
  */
+@org.springframework.lang.NonNullApi
 package org.springframework.integration.ip.dsl;
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/SocketCustomizer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/SocketCustomizer.java
new file mode 100644
index 0000000000..547407e708
--- /dev/null
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/SocketCustomizer.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.ip.udp;
+
+import java.net.DatagramSocket;
+import java.net.SocketException;
+
+/**
+ * Configures a socket.
+ *
+ * @author Gary Russell
+ * @since 5.3.3
+ */
+@FunctionalInterface
+public interface SocketCustomizer {
+
+	/**
+	 * Configure the socket ({code setTrafficClass()}, etc).
+	 * @param socket the socket.
+	 * @throws SocketException a socket exception.
+	 */
+	void configure(DatagramSocket socket) throws SocketException;
+
+}
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java
index 51dcb68bbc..0939658e0f 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java
@@ -35,6 +35,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.MessagingException;
+import org.springframework.util.Assert;
 
 /**
  * A channel adapter to receive incoming UDP packets. Packets can optionally be preceded by a
@@ -54,6 +55,7 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 
 	private static Pattern addressPattern = Pattern.compile("([^:]*):([0-9]*)");
 
+	private SocketCustomizer socketCustomizer = socket -> { };
 
 	/**
 	 * Constructs a UnicastReceivingChannelAdapter that listens on the specified port.
@@ -85,6 +87,16 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 		this.mapper.setLengthCheck(lengthCheck);
 	}
 
+	/**
+	 * Set a customizer to further configure the socket after creation.
+	 * @param socketCustomizer the customizer.
+	 * @since 5.3.3
+	 */
+	public void setSocketCustomizer(SocketCustomizer socketCustomizer) {
+		Assert.notNull(socketCustomizer, "'socketCustomizer' cannot be null");
+		this.socketCustomizer = socketCustomizer;
+	}
+
 	@Override
 	public boolean isLongLived() {
 		return true;
@@ -169,6 +181,7 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 			if (this.soSendBufferSize > 0) {
 				out.setSendBufferSize(this.soSendBufferSize);
 			}
+			this.socketCustomizer.configure(out);
 			out.send(ackPack);
 			out.close();
 		}
@@ -260,7 +273,7 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 	}
 
 	/**
-	 * Sets timeout and receive buffer size
+	 * Sets timeout and receive buffer size; calls the socket customizer.
 	 *
 	 * @param socket The socket.
 	 * @throws SocketException Any socket exception.
@@ -272,6 +285,7 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece
 		if (soReceiveBufferSize > 0) {
 			socket.setReceiveBufferSize(soReceiveBufferSize);
 		}
+		this.socketCustomizer.configure(socket);
 	}
 
 	@Override
diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java
index 050d6ee68c..ee07e3c25b 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java
@@ -105,6 +105,9 @@ public class UnicastSendingMessageHandler extends
 
 	private EvaluationContext evaluationContext;
 
+	private SocketCustomizer socketCustomizer = socket -> { };
+
+
 	/**
 	 * Basic constructor; no reliability; no acknowledgment.
 	 * @param host Destination host.
@@ -204,6 +207,25 @@ public class UnicastSendingMessageHandler extends
 				ackTimeout);
 	}
 
+	/**
+	 * @param lengthCheck if true, a four byte binary length header is added to the
+	 * packet, allowing the receiver to check for data truncation.
+	 * @since 5.0
+	 */
+	public void setLengthCheck(boolean lengthCheck) {
+		this.mapper.setLengthCheck(lengthCheck);
+	}
+
+	/**
+	 * Set a customizer to further configure the socket after creation.
+	 * @param socketCustomizer the customizer.
+	 * @since 5.3.3
+	 */
+	public void setSocketCustomizer(SocketCustomizer socketCustomizer) {
+		Assert.notNull(socketCustomizer, "'socketCustomizer' cannot be null");
+		this.socketCustomizer = socketCustomizer;
+	}
+
 	protected final void setReliabilityAttributes(boolean lengthCheck,
 			boolean acknowledge, String ackHost, int ackPort, int ackTimeout) {
 		this.mapper.setLengthCheck(lengthCheck);
@@ -221,15 +243,6 @@ public class UnicastSendingMessageHandler extends
 		}
 	}
 
-	/**
-	 * @param lengthCheck if true, a four byte binary length header is added to the
-	 * packet, allowing the receiver to check for data truncation.
-	 * @since 5.0
-	 */
-	public void setLengthCheck(boolean lengthCheck) {
-		this.mapper.setLengthCheck(lengthCheck);
-	}
-
 	@Override
 	public void doStart() {
 		if (this.acknowledge) {
@@ -496,6 +509,7 @@ public class UnicastSendingMessageHandler extends
 		if (this.getSoSendBufferSize() > 0) {
 			socket.setSendBufferSize(this.getSoSendBufferSize());
 		}
+		this.socketCustomizer.configure(socket);
 	}
 
 	/**
diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd
index 3c033e0155..23b0f551d4 100644
--- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd
+++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip.xsd
@@ -873,6 +873,18 @@
 			<xsd:extension base="common-attributes">
 				<xsd:attribute name="check-length" type="xsd:string"/>
 				<xsd:attribute name="multicast" type="xsd:string"/>
+				<xsd:attribute name="socket-customizer" type="xsd:string">
+					<xsd:annotation>
+						<xsd:documentation>
+							A SocketCustomizer bean.
+						</xsd:documentation>
+						<xsd:appinfo>
+							<tool:annotation kind="ref">
+								<tool:expected-type type="org.springframework.integration.ip.udp.SocketCustomizer"/>
+							</tool:annotation>
+						</xsd:appinfo>
+					</xsd:annotation>
+				</xsd:attribute>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserTests-context.xml b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserTests-context.xml
index 0688fe2d5b..8989575728 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserTests-context.xml
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserTests-context.xml
@@ -19,6 +19,8 @@
 
 	<task:executor id="externalTE" pool-size="10"/>
 
+	<bean id="udpCust" class = "org.springframework.integration.ip.config.ParserUnitTests$SocketCust"/>
+
 	<ip:udp-inbound-channel-adapter id="testInUdp"
 		channel="udpChannel"
 		check-length="true"
@@ -35,6 +37,7 @@
 		lookup-host="false"
 		auto-startup="false"
 		phase="1234"
+		socket-customizer="udpCust"
 	/>
 
 	<ip:udp-inbound-channel-adapter id="testInUdpMulticast"
@@ -141,6 +144,7 @@
 		local-address="127.0.0.1"
 		task-executor="externalTE"
 		order="23"
+		socket-customizer="udpCust"
 	/>
 
 	<ip:udp-outbound-channel-adapter id="testOutUdpiMulticast"
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
index d71b917c91..275e3ce93d 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
@@ -20,6 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
+import java.net.DatagramSocket;
+import java.net.SocketException;
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.Set;
@@ -66,6 +68,7 @@ import org.springframework.integration.ip.tcp.connection.TcpSocketSupport;
 import org.springframework.integration.ip.udp.DatagramPacketMessageMapper;
 import org.springframework.integration.ip.udp.MulticastReceivingChannelAdapter;
 import org.springframework.integration.ip.udp.MulticastSendingMessageHandler;
+import org.springframework.integration.ip.udp.SocketCustomizer;
 import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
 import org.springframework.integration.ip.udp.UnicastSendingMessageHandler;
 import org.springframework.integration.test.util.TestUtils;
@@ -273,6 +276,9 @@ public class ParserUnitTests {
 	@Autowired
 	TcpMessageMapper mapper;
 
+	@Autowired
+	SocketCust socketCustomizer;
+
 	private static CountDownLatch adviceCalled = new CountDownLatch(1);
 
 	@Test
@@ -293,6 +299,7 @@ public class ParserUnitTests {
 		assertThat((Boolean) mapperAccessor.getPropertyValue("lookupHost")).isFalse();
 		assertThat(TestUtils.getPropertyValue(udpIn, "autoStartup", Boolean.class)).isFalse();
 		assertThat(dfa.getPropertyValue("phase")).isEqualTo(1234);
+		assertThat(dfa.getPropertyValue("socketCustomizer")).isSameAs(this.socketCustomizer);
 	}
 
 	@Test
@@ -365,6 +372,7 @@ public class ParserUnitTests {
 		assertThat(dfa.getPropertyValue("order")).isEqualTo(23);
 		assertThat(udpOut.getComponentName()).isEqualTo("testOutUdp");
 		assertThat(udpOut.getComponentType()).isEqualTo("ip:udp-outbound-channel-adapter");
+		assertThat(dfa.getPropertyValue("socketCustomizer")).isSameAs(this.socketCustomizer);
 	}
 
 	@Test
@@ -697,4 +705,12 @@ public class ParserUnitTests {
 
 	}
 
+	public static class SocketCust implements SocketCustomizer {
+
+		@Override
+		public void configure(DatagramSocket socket) throws SocketException {
+		}
+
+	}
+
 }
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java
index cbaed55697..c76556539b 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java
@@ -18,6 +18,7 @@ package org.springframework.integration.ip.dsl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.net.DatagramSocket;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -54,6 +55,7 @@ import org.springframework.integration.ip.tcp.serializer.TcpCodecs;
 import org.springframework.integration.ip.udp.MulticastSendingMessageHandler;
 import org.springframework.integration.ip.udp.UdpServerListeningEvent;
 import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter;
+import org.springframework.integration.ip.udp.UnicastSendingMessageHandler;
 import org.springframework.integration.ip.util.TestingUtilities;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.integration.test.util.TestUtils;
@@ -98,6 +100,9 @@ public class IpIntegrationTests {
 	@Autowired
 	private UnicastReceivingChannelAdapter udpInbound;
 
+	@Autowired
+	private UnicastSendingMessageHandler udpOutbound;
+
 	@Autowired
 	private QueueChannel udpIn;
 
@@ -162,6 +167,8 @@ public class IpIntegrationTests {
 		Message<?> received = this.udpIn.receive(10000);
 		assertThat(received).isNotNull();
 		assertThat(Transformers.objectToString().transform(received).getPayload()).isEqualTo("foo");
+		assertThat(TestUtils.getPropertyValue(this.udpOutbound, "socket", DatagramSocket.class).getTrafficClass())
+				.isEqualTo(0x10);
 	}
 
 	@Test
@@ -276,7 +283,8 @@ public class IpIntegrationTests {
 
 		@Bean
 		public IntegrationFlow outUdpAdapter() {
-			return f -> f.handle(Udp.outboundAdapter(m -> m.getHeaders().get("udp_dest")));
+			return f -> f.handle(Udp.outboundAdapter(m -> m.getHeaders().get("udp_dest"))
+					.configureSocket(socket -> socket.setTrafficClass(0x10)));
 		}
 
 		@Bean
diff --git a/src/reference/asciidoc/ip.adoc b/src/reference/asciidoc/ip.adoc
index 70eaaaaf5b..9863ebc7d9 100644
--- a/src/reference/asciidoc/ip.adoc
+++ b/src/reference/asciidoc/ip.adoc
@@ -72,6 +72,7 @@ The following example configures a UDP outbound channel adapter:
     host="somehost"
     port="11111"
     multicast="false"
+    socket-customizer="udpCustomizer"
     channel="exampleChannel"/>
 ----
 ====
@@ -88,7 +89,9 @@ The `length` header provides a mechanism to detect this.
 Starting with version 4.3, you can set the `port` to `0`, in which case the operating system chooses the port.
 The chosen port can be discovered by invoking `getPort()` after the adapter is started and `isListening()` returns `true`.
 
-The preceding example shows an outbound channel adapter that adds length checking to the datagram packets:
+Starting with version 5.3.3, you can add a `SocketCustomizer` bean to modify the `DatagramSocket` after it is created (for example, call `setTrafficClass(0x10)`).
+
+The following example shows an outbound channel adapter that adds length checking to the datagram packets:
 
 ====
 [source,xml]
@@ -143,7 +146,7 @@ The following example shows how to configure an outbound UDP adapter with Java:
 @Bean
 @ServiceActivator(inputChannel = "udpOut")
 public UnicastSendingMessageHandler handler() {
-	return new UnicastSendingMessageHandler("localhost", 11111);
+    return new UnicastSendingMessageHandler("localhost", 11111);
 }
 ----
 ====
@@ -159,9 +162,9 @@ The following example shows how to configure an outbound UDP adapter with the Ja
 ----
 @Bean
 public IntegrationFlow udpOutFlow() {
-	return IntegrationFlows.from("udpOut")
-			.handle(Udp.outboundAdapter("localhost", 1234))
-			.get();
+    return f -> f.handle(Udp.outboundAdapter("localhost", 1234)
+                    .configureSocket(socket -> socket.setTrafficClass(0x10)))
+                .get();
 }
 ----
 ====
@@ -178,6 +181,7 @@ The following example shows how to configure a basic unicast inbound udp channel
     port="11111"
     receive-buffer-size="500"
     multicast="false"
+    socket-customizer="udpCustomizer"
     check-length="true"/>
 ----
 ====
@@ -201,6 +205,9 @@ By default, reverse DNS lookups are done on inbound packets to convert IP addres
 In environments where DNS is not configured, this can cause delays.
 You can override this default behavior by setting the `lookup-host` attribute to `false`.
 
+Starting with version 5.3.3, you can add a `SocketCustomizer` bean to modify the `DatagramSocket` after it is created.
+It is called for the receiving socket and any sockets created for sending acks.
+
 ==== Inbound UDP Adapters (Java Configuration)
 
 The following example shows how to configure an inbound UDP adapter with Java:
@@ -209,9 +216,9 @@ The following example shows how to configure an inbound UDP adapter with Java:
 ----
 @Bean
 public UnicastReceivingChannelAdapter udpIn() {
-	UnicastReceivingChannelAdapter adapter = new UnicastReceivingChannelAdapter(11111);
-	adapter.setOutputChannelName("udpChannel");
-	return adapter;
+    UnicastReceivingChannelAdapter adapter = new UnicastReceivingChannelAdapter(11111);
+    adapter.setOutputChannelName("udpChannel");
+    return adapter;
 }
 ----
 
@@ -223,9 +230,9 @@ The following example shows how to configure an inbound UDP adapter with the Jav
 ----
 @Bean
 public IntegrationFlow udpIn() {
-	return IntegrationFlows.from(Udp.inboundAdapter(11111))
-			.channel("udpChannel")
-			.get();
+    return IntegrationFlows.from(Udp.inboundAdapter(11111))
+            .channel("udpChannel")
+            .get();
 }
 ----
 
@@ -278,11 +285,11 @@ The following example shows the equivalent configuration with the Java DSL:
 ----
 @Bean
 public IntegrationFlow udpEchoUpcaseServer() {
-	return IntegrationFlows.from(Udp.inboundAdapter(11111).id("udpIn"))
-			.<byte[], String>transform(p -> new String(p).toUpperCase())
-			.handle(Udp.outboundAdapter("headers['ip_packetAddress']")
-					.socketExpression("@udpIn.socket"))
-			.get();
+    return IntegrationFlows.from(Udp.inboundAdapter(11111).id("udpIn"))
+            .<byte[], String>transform(p -> new String(p).toUpperCase())
+            .handle(Udp.outboundAdapter("headers['ip_packetAddress']")
+                    .socketExpression("@udpIn.socket"))
+            .get();
 }
 ----
 ====
@@ -1386,10 +1393,10 @@ The following listing shows the definition of the `TcpNetConnectionSupport` stra
 ----
 public interface TcpNetConnectionSupport {
 
-	TcpNetConnection createNewConnection(Socket socket,
-			boolean server, boolean lookupHost,
-			ApplicationEventPublisher applicationEventPublisher,
-			String connectionFactoryName) throws Exception;
+    TcpNetConnection createNewConnection(Socket socket,
+            boolean server, boolean lookupHost,
+            ApplicationEventPublisher applicationEventPublisher,
+            String connectionFactoryName) throws Exception;
 
 }
 ----
diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc
index b24d71edf7..ad23387b22 100644
--- a/src/reference/asciidoc/whats-new.adoc
+++ b/src/reference/asciidoc/whats-new.adoc
@@ -126,7 +126,7 @@ The `encodeUri` property on the `AbstractWebServiceOutboundGateway` has been dep
 See <<./ws.adoc#ws,Web Services Support>> for more information.
 
 [[x5.3-tcp]]
-=== TCP Changes
+=== TCP/UDP Changes
 
 The `FailoverClientConnectionFactory` no longer fails back, by default, until the current connection fails.
 See <<./ip.adoc#failover-cf,TCP Failover Client Connection Factory>> for more information.