diff --git a/configure.ac b/configure.ac
index 3e1d9a2ba..9561f2ba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -857,6 +857,12 @@ AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
   AC_MSG_WARN([Using the internal jimtcl is deprecated and will not be possible in the future.])
 ])
 
+AS_IF([test "x$enable_amtjtagaccel" != "xno"], [
+  echo
+  echo
+  AC_MSG_WARN([Amontec JTAG-Accelerator adapter is deprecated and support will be removed in the next release!])
+])
+
 echo
 echo
 echo OpenOCD configuration summary
diff --git a/doc/openocd.texi b/doc/openocd.texi
index bd6b3704a..04fa77bd4 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2508,6 +2508,8 @@ enabled when OpenOCD is configured, in order to be made
 available at run time.
 
 @deffn {Interface Driver} {amt_jtagaccel}
+@b{Note: This adapter is deprecated and support will be removed in the next release!}
+
 Amontec Chameleon in its JTAG Accelerator configuration,
 connected to a PC's EPP mode parallel port.
 This defines some driver-specific commands:
diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index 633c20413..d3f8bb61e 100644
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -419,6 +419,8 @@ static int amt_jtagaccel_init(void)
 #endif
 	uint8_t ar_status;
 
+	LOG_WARNING("This adapter is deprecated and support will be removed in the next release!");
+
 #if PARPORT_USE_PPDEV == 1
 	if (device_handle > 0) {
 		LOG_ERROR("device is already opened");