diff --git a/media/multipart/src/main/java/io/helidon/media/multipart/MultiPartEncoder.java b/media/multipart/src/main/java/io/helidon/media/multipart/MultiPartEncoder.java
index c7f73e4ae81..b94c2f1949f 100644
--- a/media/multipart/src/main/java/io/helidon/media/multipart/MultiPartEncoder.java
+++ b/media/multipart/src/main/java/io/helidon/media/multipart/MultiPartEncoder.java
@@ -143,6 +143,6 @@ private Publisher<DataChunk> createBodyPartPublisher(final WriteableBodyPart bod
                 // Part body
                 bodyPart.content().init(context)),
                 // Part postfix
-                Single.just(DataChunk.create("\n".getBytes(StandardCharsets.UTF_8))));
+                Single.just(DataChunk.create("\r\n".getBytes(StandardCharsets.UTF_8))));
     }
 }
diff --git a/media/multipart/src/test/java/io/helidon/media/multipart/MultiPartEncoderTest.java b/media/multipart/src/test/java/io/helidon/media/multipart/MultiPartEncoderTest.java
index f506f110432..449f8bab4ba 100644
--- a/media/multipart/src/test/java/io/helidon/media/multipart/MultiPartEncoderTest.java
+++ b/media/multipart/src/test/java/io/helidon/media/multipart/MultiPartEncoderTest.java
@@ -17,13 +17,16 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Flow;
 import java.util.concurrent.Flow.Subscriber;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.LongStream;
 
-import io.helidon.common.http.MediaType;
 import io.helidon.common.http.DataChunk;
+import io.helidon.common.http.MediaType;
 import io.helidon.common.reactive.Multi;
 import io.helidon.media.common.ContentReaders;
 import io.helidon.media.multipart.MultiPartDecoderTest.DataChunkSubscriber;
@@ -55,7 +58,7 @@ public void testEncodeOnePart() throws Exception {
         assertThat(message, is(equalTo(
                 "--" + boundary + "\r\n"
                 + "\r\n"
-                + "part1\n"
+                + "part1\r\n"
                 + "--" + boundary + "--")));
     }
 
@@ -73,7 +76,7 @@ public void testEncodeOnePartWithHeaders() throws Exception {
                 "--" + boundary + "\r\n"
                 + "Content-Type:text/plain\r\n"
                 + "\r\n"
-                + "part1\n"
+                + "part1\r\n"
                 + "--" + boundary + "--")));
     }
 
@@ -90,10 +93,10 @@ public void testEncodeTwoParts() throws Exception {
         assertThat(message, is(equalTo(
                 "--" + boundary + "\r\n"
                 + "\r\n"
-                + "part1\n"
+                + "part1\r\n"
                 + "--" + boundary + "\r\n"
                 + "\r\n"
-                + "part2\n"
+                + "part2\r\n"
                 + "--" + boundary + "--")));
     }