diff --git a/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java b/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java
index c2d583f2c..b188e93c8 100644
--- a/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java
+++ b/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java
@@ -143,7 +143,7 @@ public MultipartEntityBuilder addBinaryBody(
 
     public MultipartEntityBuilder addBinaryBody(
             final String name, final File file) {
-        return addBinaryBody(name, file, ContentType.DEFAULT_BINARY, null);
+        return addBinaryBody(name, file, ContentType.DEFAULT_BINARY, file != null ? file.getName() : null);
     }
 
     public MultipartEntityBuilder addBinaryBody(