diff --git a/changelog.html b/src/changelog.html
similarity index 100%
rename from changelog.html
rename to src/changelog.html
diff --git a/src/main/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxy.java b/src/main/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxy.java
index a09e01e..2eda3be 100644
--- a/src/main/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxy.java
+++ b/src/main/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxy.java
@@ -127,21 +127,29 @@ static Set<org.xmpp.forms.DataForm> merge( @Nullable Set<org.xmpp.forms.DataForm
             .orElse( newDataForm );
 
         // Now, add or merge fields from the extension data into the result.
-        for ( final Field extensionFields : extensionElement.getFields() )
+        for ( final Field extensionField : extensionElement.getFields() )
         {
-            FormField formField = dataForm.getField(extensionFields.getVarName());
+            FormField formField = dataForm.getField(extensionField.getVarName());
             if ( formField == null ) {
-                formField = dataForm.addField( extensionFields.getVarName(), extensionFields.getLabel(), null);
+                formField = dataForm.addField( extensionField.getVarName(), extensionField.getLabel(), null);
             }
 
-            for ( final String value : extensionFields.getValues() )
+            for ( final String value : extensionField.getValues() )
             {
                 formField.addValue(value);
             }
+
+            // Default type is text-single, multiple values means it actually is a multi-field
+            if(isMultiField(formField)) {
+                formField.setType(FormField.Type.text_multi);
+            }
         }
 
         result.add(dataForm);
 
         return result;
     }
+    private static boolean isMultiField(FormField field) {
+        return field.getValues() != null && field.getValues().size() > 1;
+    }
 }
diff --git a/plugin.xml b/src/plugin.xml
similarity index 100%
rename from plugin.xml
rename to src/plugin.xml
diff --git a/readme.html b/src/readme.html
similarity index 100%
rename from readme.html
rename to src/readme.html
diff --git a/src/test/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxyMergeTest.java b/src/test/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxyMergeTest.java
index daea5cc..6e7039b 100644
--- a/src/test/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxyMergeTest.java
+++ b/src/test/java/org/igniterealtime/openfire/plugin/mucextinfo/DiscoInfoProviderProxyMergeTest.java
@@ -19,11 +19,9 @@
 import org.xmpp.forms.DataForm;
 import org.xmpp.forms.FormField;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
 
 import static org.junit.Assert.*;
 
@@ -224,6 +222,7 @@ public void testOriginalWithExtensionSameFormSameFieldDifferentValue()
         assertEquals( 2, resultFields.size() ); // should contain the field we added, as well as a 'FORM_TYPE' field.
         assertTrue( resultFields.stream().anyMatch( formField -> "origvar".equals( formField.getVariable() )
             && "origlabel".equals( formField.getLabel() )
+            && formField.getType().equals(FormField.Type.text_multi)
             && formField.getValues().contains( "origvalue")
             && formField.getValues().contains( "extvalue")
             && formField.getValues().size() == 2