diff --git a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index cd74c1ff7..06ec67316 100644
--- a/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -473,7 +473,7 @@ public class FileTransferNegotiator {
     private DataForm createDefaultInitiationForm() {
         DataForm form = new DataForm(Form.TYPE_FORM);
         FormField field = new FormField(STREAM_DATA_FIELD_NAME);
-        field.setType(FormField.TYPE_LIST_MULTI);
+        field.setType(FormField.TYPE_LIST_SINGLE);
         if (!IBB_ONLY) {
             field.addOption(new FormField.Option(Socks5BytestreamManager.NAMESPACE));
         }
diff --git a/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
new file mode 100644
index 000000000..9a6e6cd63
--- /dev/null
+++ b/test-unit/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java
@@ -0,0 +1,41 @@
+package org.jivesoftware.smackx.filetransfer;
+
+import static org.junit.Assert.*;
+
+import org.jivesoftware.smack.DummyConnection;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smackx.ServiceDiscoveryManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FileTransferNegotiatorTest {
+    private DummyConnection connection;
+
+    @Before
+    public void setUp() throws Exception {
+	// Uncomment this to enable debug output
+	//Connection.DEBUG_ENABLED = true;
+
+	connection = new DummyConnection();
+	connection.connect();
+	connection.login("me", "secret");
+	new ServiceDiscoveryManager(connection);
+    }
+    
+    @After
+    public void tearDown() throws Exception {
+	if (connection != null)
+	    connection.disconnect();
+    }
+
+    @Test
+    public void verifyForm() throws Exception
+    {
+	FileTransferNegotiator fileNeg = FileTransferNegotiator.getInstanceFor(connection);
+	fileNeg.negotiateOutgoingTransfer("me", "streamid", "file", 1024, null, 10);
+	Packet packet = connection.getSentPacket();
+	assertTrue(packet.toXML().indexOf("\"stream-method\" type=\"list-single\"") != -1);
+    }
+}