diff --git a/configure.ac b/configure.ac
index 9561f2ba0..0bac37e5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -862,6 +862,11 @@ AS_IF([test "x$enable_amtjtagaccel" != "xno"], [
   echo
   AC_MSG_WARN([Amontec JTAG-Accelerator adapter is deprecated and support will be removed in the next release!])
 ])
+AS_IF([test "x$build_gw16012" = "xyes"], [
+  echo
+  echo
+  AC_MSG_WARN([Gateworks GW16012 JTAG adapter is deprecated and support will be removed in the next release!])
+])
 
 echo
 echo
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 04fa77bd4..4ad66ee5f 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2929,6 +2929,8 @@ image. To be used with USB-Blaster II only.
 @end deffn
 
 @deffn {Interface Driver} {gw16012}
+@b{Note: This adapter is deprecated and support will be removed in the next release!}
+
 Gateworks GW16012 JTAG programmer.
 This has one driver-specific command:
 
diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 805065f1f..98f775422 100644
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -461,6 +461,8 @@ static int gw16012_init(void)
 {
 	uint8_t status_port;
 
+	LOG_WARNING("This adapter is deprecated and support will be removed in the next release!");
+
 	if (gw16012_init_device() != ERROR_OK)
 		return ERROR_JTAG_INIT_FAILED;