diff --git a/libfreerdp/core/nego.c b/libfreerdp/core/nego.c
index 80e531ec4..ab2753a03 100644
--- a/libfreerdp/core/nego.c
+++ b/libfreerdp/core/nego.c
@@ -704,9 +704,19 @@ BOOL nego_send_negotiation_request(rdpNego* nego)
 	if (nego->RoutingToken)
 	{
 		Stream_Write(s, nego->RoutingToken, nego->RoutingTokenLength);
-		Stream_Write_UINT8(s, 0x0D); /* CR */
-		Stream_Write_UINT8(s, 0x0A); /* LF */
-		length += nego->RoutingTokenLength + 2;
+		/* Ensure Routing Token is correctly terminated - may already be present in string */
+		if (nego->RoutingTokenLength>2 && (nego->RoutingToken[nego->RoutingTokenLength-2]==0x0D && nego->RoutingToken[nego->RoutingTokenLength-1]==0x0A))
+		{
+			DEBUG_NEGO("Routing token looks correctly terminated - use verbatim");
+			length +=nego->RoutingTokenLength;
+		}
+		else
+		{
+			DEBUG_NEGO("Adding terminating CRLF to routing token");
+			Stream_Write_UINT8(s, 0x0D); /* CR */
+			Stream_Write_UINT8(s, 0x0A); /* LF */
+			length += nego->RoutingTokenLength + 2;
+		}
 	}
 	else if (nego->cookie)
 	{