diff --git a/ext/wddx/config.m4 b/ext/wddx/config.m4
index 2dbd479ab55..1530895b33f 100644
--- a/ext/wddx/config.m4
+++ b/ext/wddx/config.m4
@@ -1,14 +1,14 @@
 dnl $Id$
 dnl config.m4 for extension wddx
 
-PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
-[  --enable-wddx           Enable WDDX support])
+PHP_ARG_ENABLE(wddx,for WDDX support,
+[  --disable-wddx           Disable WDDX support], yes)
 
-if test "$PHP_WDDX" = "yes"; then
+if test "$PHP_WDDX" != "no"; then
   if test "$enable_xml" = "no"; then
     AC_MSG_WARN(Activating XML)
     enable_xml=yes
   fi
   AC_DEFINE(HAVE_WDDX, 1, [ ])
-  PHP_EXTENSION(wddx)
+  PHP_EXTENSION(wddx, $ext_shared)
 fi
diff --git a/ext/wddx/setup.stub b/ext/wddx/setup.stub
deleted file mode 100644
index 30500bf4063..00000000000
--- a/ext/wddx/setup.stub
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Source$
-# $Id$
-
-define_option with-wddx 'wddx support?' yesnodir no \
-'    Whether to build the wddx extension.'
-