diff --git a/cmake/modules/LibnfcDrivers.cmake b/cmake/modules/LibnfcDrivers.cmake
index bbb9af3..267d002 100644
--- a/cmake/modules/LibnfcDrivers.cmake
+++ b/cmake/modules/LibnfcDrivers.cmake
@@ -1,8 +1,9 @@
-SET(LIBNFC_DRIVER_ACR122_PCSC ON CACHE BOOL "Enable ACR122 support (Depends on PC/SC)")
-#SET(LIBNFC_DRIVER_ACR122_USB ON CACHE BOOL "Enable ACR122 support (Direct USB connection)")
-SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)")
+SET(LIBNFC_DRIVER_ACR122_PCSC OFF CACHE BOOL "Enable ACR122 support (Depends on PC/SC)")
+SET(LIBNFC_DRIVER_ACR122_USB ON CACHE BOOL "Enable ACR122 support (Direct USB connection)")
+SET(LIBNFC_DRIVER_ACR122S ON CACHE BOOL "Enable ACR122S support (Use serial port)")
 SET(LIBNFC_DRIVER_ARYGON ON CACHE BOOL "Enable ARYGON support (Use serial port)")
-SET(LIBNFC_DRIVER_PN532_UART OFF CACHE BOOL "Enable PN532 UART support (Use serial port)")
+SET(LIBNFC_DRIVER_PN532_UART ON CACHE BOOL "Enable PN532 UART support (Use serial port)")
+SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)")
 
 IF(LIBNFC_DRIVER_ACR122_PCSC)
   FIND_PACKAGE(PCSC REQUIRED)
@@ -10,12 +11,17 @@ IF(LIBNFC_DRIVER_ACR122_PCSC)
   SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_pcsc")
 ENDIF(LIBNFC_DRIVER_ACR122_PCSC)
 
-IF(LIBNFC_DRIVER_PN53X_USB)
+IF(LIBNFC_DRIVER_ACR122_USB)
   FIND_PACKAGE(LIBUSB REQUIRED)
-  ADD_DEFINITIONS("-DDRIVER_PN53X_USB_ENABLED")
-  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn53x_usb")
-  SET(USB_REQUIRED TRUE)
-ENDIF(LIBNFC_DRIVER_PN53X_USB)
+  ADD_DEFINITIONS("-DDRIVER_ACR122_USB_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_usb")
+ENDIF(LIBNFC_DRIVER_ACR122_USB)
+
+IF(LIBNFC_DRIVER_ACR122S)
+  ADD_DEFINITIONS("-DDRIVER_ACR122S_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122s")
+  SET(UART_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_ACR122S)
 
 IF(LIBNFC_DRIVER_ARYGON)
   ADD_DEFINITIONS("-DDRIVER_ARYGON_ENABLED")
@@ -29,5 +35,11 @@ IF(LIBNFC_DRIVER_PN532_UART)
   SET(UART_REQUIRED TRUE)
 ENDIF(LIBNFC_DRIVER_PN532_UART)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/drivers)
+IF(LIBNFC_DRIVER_PN53X_USB)
+  FIND_PACKAGE(LIBUSB REQUIRED)
+  ADD_DEFINITIONS("-DDRIVER_PN53X_USB_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn53x_usb")
+  SET(USB_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_PN53X_USB)
 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/drivers)
diff --git a/libnfc/drivers/pn532_uart.c b/libnfc/drivers/pn532_uart.c
index 0a700b4..3481001 100644
--- a/libnfc/drivers/pn532_uart.c
+++ b/libnfc/drivers/pn532_uart.c
@@ -1,9 +1,13 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010 Roel Verdult
- * Copyright (C) 2011 Romain Tartière
- * Copyright (C) 2010, 2011, 2012 Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * Additional contributors of this file:
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the