diff --git a/acconfig.h b/acconfig.h
index 7adced43e..db94477cb 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -35,6 +35,9 @@
 /* Define if we want some experimental code */ 
 #undef EXPERIMENTAL_CODE
 
+/* Define if we want to enable experimental devices */
+#undef EXP_DEV
+
 /* Define if we want noise integration code */
 #undef INT_NOISE
 
diff --git a/configure.in b/configure.in
index 09e055a57..5aab9252c 100644
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,10 @@ dnl --enable-experimental : define EXPERIMENTAL_CODE for the code
 AC_ARG_ENABLE(experimental,
     [  --enable-experimental   Enable some experimental code])
 
+dnl --enable-expdevices : Enable the compilation of experimental deviced
+AC_ARG_ENABLE(expdevices,
+    [  --enable-expdevices   Enable experimental devices (they do not compile)])
+
 dnl --enable-ekv: define HAVE_EKV in the code. This is for EKV model support
 AC_ARG_ENABLE(ekv,
     [  --enable-ekv            Enable ekv model *not in standard distribution*])
@@ -452,6 +456,10 @@ if test "$enable_cluster" = "yes"; then
    LIBS="$LIBS -lpthread"   
 fi
 
+if test "$enable_expdevices" = "yes"; then
+	AC_DEFINE(EXP_DEV)
+	AC_MSG_RESULT(WARNING: Experimental devices enabled)	
+fi
 
 dnl --with-readline : the user wants to use readline library
 AC_ARG_WITH(readline,