diff --git a/configure.ac b/configure.ac
index 4352e906..8eea8528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -501,6 +501,18 @@ dnl ============================
 AC_ARG_ENABLE(modelock, AS_HELP_STRING([--enable-modelock], [XKB keyboard language status support]),
 		AC_DEFINE(XKB_MODELOCK, 1, [whether XKB language MODELOCK should be enabled]))
 
+dnl XDND Drag-nd-Drop support
+dnl ============================
+AC_ARG_ENABLE([xdnd],
+    [AS_HELP_STRING([--disable-xdnd], [disable Drag-nd-Drop support])],
+    [AS_CASE(["$enableval"],
+        [yes|no], [],
+        [AC_MSG_ERROR([bad value $enableval for --disable-xdnd]) ]) ],
+    [enable_xdnd=yes
+  supported_xext="$supported_xext XDnD"
+  AC_DEFINE(XDND, 1, [whether Drag-nd-Drop support should be enabled])
+])
+
 dnl XShape support
 dnl ==============
 AC_ARG_ENABLE([shape],
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index f444a19f..c1548ee6 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -36,9 +36,6 @@
 /* If you want animations for iconification, shading, icon arrangement etc. */
 #define ANIMATIONS
 
-/* support for XDND drop in the Dock. Experimental */
-/*#define XDND*/
-
 /* support for Motif window manager (mwm) window hints */
 #define MWM_HINTS