diff --git a/drivers/Makefile b/drivers/Makefile
index fefb6a718b..daac4cd18c 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -76,6 +76,7 @@ include usbhost$(DELIM)Make.defs
 include usbmonitor$(DELIM)Make.defs
 include video$(DELIM)Make.defs
 include wireless$(DELIM)Make.defs
+include contactless$(DELIM)Make.defs
 
 ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
   CSRCS += dev_null.c dev_zero.c
diff --git a/drivers/contactless/Make.defs b/drivers/contactless/Make.defs
index a678f826c3..0df7134d88 100644
--- a/drivers/contactless/Make.defs
+++ b/drivers/contactless/Make.defs
@@ -37,11 +37,11 @@ ifeq ($(CONFIG_DRIVERS_CONTACTLESS),y)
 
 # Include contactless drivers
 
-ifeq ($(CONFIG_WL_MFRC522),y)
+ifeq ($(CONFIG_CL_MFRC522),y)
 CSRCS += mfrc522.c
 endif
 
-ifeq ($(CONFIG_WL_PN532),y)
+ifeq ($(CONFIG_CL_PN532),y)
 CSRCS += pn532.c
 endif
 
diff --git a/drivers/contactless/mfrc522.c b/drivers/contactless/mfrc522.c
index 9c5cd43c43..b0c1a786df 100644
--- a/drivers/contactless/mfrc522.c
+++ b/drivers/contactless/mfrc522.c
@@ -50,7 +50,7 @@
 #include <unistd.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/contactless/contactless.h>
+#include <nuttx/drivers/contactless.h>
 
 #include "mfrc522.h"
 
@@ -168,7 +168,7 @@ static inline void mfrc522_configspi(FAR struct spi_dev_s *spi)
   SPI_SETMODE(spi, SPIDEV_MODE0);
   SPI_SETBITS(spi, 8);
   (void)SPI_HWFEATURES(spi, 0);
-  (void)SPI_SETFREQUENCY(spi, CONFIG_CL_MFRC522_SPI_FREQ);
+  (void)SPI_SETFREQUENCY(spi, CONFIG_MFRC522_SPI_FREQ);
 }
 
 static inline void mfrc522_select(struct mfrc522_dev_s *dev)
diff --git a/include/nuttx/drivers/contactless.h b/include/nuttx/drivers/contactless.h
new file mode 100644
index 0000000000..b5beaf56b1
--- /dev/null
+++ b/include/nuttx/drivers/contactless.h
@@ -0,0 +1,67 @@
+/************************************************************************************
+ * include/nuttx/contactless/contactless.h
+ *
+ *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
+ *   Author: Laurent Latil <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/* This file includes common definitions to be used in all contactless drivers
+ * (when applicable).
+ */
+
+#ifndef __INCLUDE_NUTTX_DRIVERS_CONTACTLESS_H
+#define __INCLUDE_NUTTX_DRIVERS_CONTACTLESS_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/fs/ioctl.h>
+
+#ifdef CONFIG_DRIVERS_CONTACTLESS
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* IOCTL Commands *******************************************************************/
+
+/* Contactless drivers can provide additional, device specific ioctl
+ * commands, beginning with this value:
+ */
+
+#define CLIOC_USER              0x0001         /* Lowest, unused CL ioctl command */
+
+#define _CLIOC_USER(nr)         _CLIOC(nr + CLIOC_USER)
+
+#endif
+
+#endif  /* __INCLUDE_NUTTX_CONTACTLESS_H */