diff --git a/.travis.yml b/.travis.yml
index 441e3ba..8762519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 language: java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 install:
   ./mvnw --settings .settings.xml install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip -B -V
diff --git a/feign-form-spring/src/main/java/feign/form/spring/SpringFormEncoder.java b/feign-form-spring/src/main/java/feign/form/spring/SpringFormEncoder.java
index 2ce3321..a4a1b47 100644
--- a/feign-form-spring/src/main/java/feign/form/spring/SpringFormEncoder.java
+++ b/feign-form-spring/src/main/java/feign/form/spring/SpringFormEncoder.java
@@ -29,6 +29,7 @@
 import feign.form.MultipartFormContentProcessor;
 
 import lombok.val;
+import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -63,9 +64,9 @@ public SpringFormEncoder (Encoder delegate) {
   public void encode (Object object, Type bodyType, RequestTemplate template) throws EncodeException {
     if (bodyType.equals(MultipartFile[].class)) {
       val files = (MultipartFile[]) object;
-      val data = new HashMap<String, Object>(files.length, 1.F);
+      val data = new LinkedMultiValueMap<String, Object>();
       for (val file : files) {
-        data.put(file.getName(), file);
+        data.add(file.getName(), file);
       }
       super.encode(data, MAP_STRING_WILDCARD, template);
     } else if (bodyType.equals(MultipartFile.class)) {