diff --git a/ChangeLog b/ChangeLog
index ceb4f6c..e332644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-12 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/x11/XGDragView.m (GSActionForDragOperation,
+	GSDragOperationForAction): Corrected drag type conversion.
+	Patch by Andreas Schick <andreas.schik@googlemail.com>
+
 2011-09-11  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/cairo/CairoGState.m (-drawGState:...): Check that the source
diff --git a/Source/x11/XGDragView.m b/Source/x11/XGDragView.m
index 47b6d63..a6d849e 100644
--- a/Source/x11/XGDragView.m
+++ b/Source/x11/XGDragView.m
@@ -95,7 +95,10 @@ Atom
 GSActionForDragOperation(unsigned int op)
 {
   Atom xaction;
-  if (op == NSDragOperationAll)
+
+  if (op == NSDragOperationEvery)
+    xaction = dnd.XdndActionAsk;
+  else if (op == NSDragOperationAll)
     xaction = dnd.XdndActionAsk;
   else if (op & NSDragOperationCopy)
     xaction = dnd.XdndActionCopy;
@@ -124,7 +127,7 @@ GSDragOperationForAction(Atom xaction)
   else if (xaction == dnd.XdndActionLink) 
     action = NSDragOperationLink;
   else if (xaction == dnd.XdndActionAsk) 
-    action = NSDragOperationAll;
+    action = NSDragOperationEvery;
   else if (xaction == dnd.XdndActionPrivate) 
     action = NSDragOperationPrivate;
   else