diff --git a/ChangeLog b/ChangeLog
index edc5221e..2737175b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-31  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Pasquale Cocchini:
+	bug #46020: Add TIAO TUMPA to the conf file.
+	* avrdude.conf.in (tumpa): New entry.
+
 2015-10-31  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Submitted by Pasquale Cocchini:
diff --git a/NEWS b/NEWS
index b660dcbf..844e1c45 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ Current:
         (patch #8529 2 more ftdi_syncbb devices)
 
   * Bugfixes
+    - bug #46020: Add TIAO TUMPA to the conf file.
     - bug #46021: Please add read in the memory lock section of ATtiny85
     - bug #42337 avrdude.conf updates for UM232H/CM232H
     - bug #42056: double free or corruption triggered at exit
diff --git a/avrdude.conf.in b/avrdude.conf.in
index ba0b7f81..8c2d1215 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -586,6 +586,24 @@ programmer
   buff   = 7;
 ;
 
+# submitted as bug #46020
+programmer
+  id     = "tumpa";
+  desc   = "TIAO USB Multi-Protocol Adapter";
+  type   = "avrftdi";
+  connection_type = usb;
+  usbvid = 0x0403;
+  usbpid = 0x8A98;
+  usbdev = "A";
+  usbvendor = "TIAO";
+  usbproduct = "";
+  usbsn  = "";
+  sck    = 0; # TCK 9
+  mosi   = 1; # TDI 5
+  miso   = 2; # TDO 13
+  reset  = 3; # TMS 7
+;
+
 programmer
   id    = "avrisp";
   desc  = "Atmel AVR ISP";