diff --git a/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java b/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java
index 3f932cd51..c4078049a 100644
--- a/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java
+++ b/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java
@@ -136,10 +136,10 @@ abstract class AbstractMultipartForm {
         final OutputStream out,
         final boolean writeContent) throws IOException {
 
-        final ByteArrayBuffer boundary = encode(this.charset, getBoundary());
+        final ByteArrayBuffer boundaryEncoded = encode(this.charset, getBoundary());
         for (final FormBodyPart part: getBodyParts()) {
             writeBytes(TWO_DASHES, out);
-            writeBytes(boundary, out);
+            writeBytes(boundaryEncoded, out);
             writeBytes(CR_LF, out);
 
             formatMultipartHeader(part, out);
@@ -152,7 +152,7 @@ abstract class AbstractMultipartForm {
             writeBytes(CR_LF, out);
         }
         writeBytes(TWO_DASHES, out);
-        writeBytes(boundary, out);
+        writeBytes(boundaryEncoded, out);
         writeBytes(TWO_DASHES, out);
         writeBytes(CR_LF, out);
     }