diff --git a/src/org/openstreetmap/josm/gui/FileDrop.java b/src/org/openstreetmap/josm/gui/FileDrop.java
index 5470cd2..9e5a87e 100644
--- a/src/org/openstreetmap/josm/gui/FileDrop.java
+++ b/src/org/openstreetmap/josm/gui/FileDrop.java
@@ -32,7 +32,6 @@ import javax.swing.border.Border;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.OpenFileAction;
-import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
 
 // CHECKSTYLE.OFF: HideUtilityClassConstructor
 
@@ -74,7 +73,9 @@ import org.openstreetmap.josm.gui.FileDrop.TransferableObject;
  * @author  rharder@users.sf.net
  * @version 1.0.1
  * @since 1231
+ * @deprecated To be removed from JOSM in the end of 2016.
  */
+@Deprecated
 public class FileDrop {
 
     // CHECKSTYLE.ON: HideUtilityClassConstructor
diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java
index 9f0dfe6..4f0c025 100644
--- a/src/org/openstreetmap/josm/gui/GettingStarted.java
+++ b/src/org/openstreetmap/josm/gui/GettingStarted.java
@@ -5,7 +5,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
 import java.awt.EventQueue;
-import java.awt.GraphicsEnvironment;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
@@ -24,6 +23,7 @@ import javax.swing.event.HyperlinkListener;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.datatransfer.FileTransferHandler;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreference;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferenceListener;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
@@ -124,6 +124,7 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
                 + "</h1><h2 align=\"center\">" + tr("Downloading \"Message of the day\"") + "</h2></html>");
         // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM
         lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none");
+        lg.setTransferHandler(null);
 
         JScrollPane scroller = new JScrollPane(lg);
         scroller.setViewportBorder(new EmptyBorder(10, 100, 10, 100));
@@ -131,9 +132,7 @@ public final class GettingStarted extends JPanel implements ProxyPreferenceListe
 
         getMOTD();
 
-        if (!GraphicsEnvironment.isHeadless()) {
-            new FileDrop(scroller);
-        }
+        setTransferHandler(new FileTransferHandler());
     }
 
     private void getMOTD() {
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/FileTransferHandler.java b/src/org/openstreetmap/josm/gui/datatransfer/FileTransferHandler.java
new file mode 100644
index 0000000..d289a0a
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/datatransfer/FileTransferHandler.java
@@ -0,0 +1,44 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.datatransfer;
+
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+
+import javax.swing.JComponent;
+import javax.swing.TransferHandler;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.datatransfer.importers.FilePaster;
+
+/**
+ * This transfer handler allows to drop files to open them.
+ *
+ * @author Michael Zangl
+ * @since xxx
+ */
+public class FileTransferHandler extends TransferHandler {
+
+    private static final FilePaster filePaster = new FilePaster();
+
+    @Override
+    public int getSourceActions(JComponent c) {
+        return COPY;
+    }
+
+    @Override
+    public boolean canImport(TransferSupport support) {
+        return filePaster.supports(support);
+    }
+
+    @Override
+    public boolean importData(TransferSupport support) {
+        try {
+            if (filePaster.supports(support)) {
+                return filePaster.importData(support, null, null);
+            }
+        } catch (UnsupportedFlavorException | IOException e) {
+            Main.warn(e, "Error while importing file.");
+        }
+        return super.importData(support);
+    }
+}