diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in
index 765eda87..8e22d75d 100644
--- a/src/avrdude.conf.in
+++ b/src/avrdude.conf.in
@@ -1154,6 +1154,34 @@ programmer
     sdi                    = 2;
 ;
 
+#------------------------------------------------------------
+# flyswatter2
+#------------------------------------------------------------
+
+# FT2232H based JTAG programmer. Requires a buff pin to be set.
+# https://www.tincantools.com/flyswatter2
+
+programmer
+    id                     = "flyswatter2";
+    desc                   = "TinCan Tools Flyswatter 2";
+    type                   = "avrftdi";
+    prog_modes             = PM_TPI | PM_ISP;
+    connection_type        = usb;
+    usbvid                 = 0x0403;
+    usbpid                 = 0x6010;
+    usbdev                 = "A";
+    usbvendor              = "TinCanTools";
+    usbproduct             = "Flyswatter2";
+    buff                   = ~6;
+    reset                  = 3;
+    sck                    = 0;
+    sdo                    = 1;
+    sdi                    = 2;
+    rdyled                 = ~11;
+    pgmled                 = ~12;
+;
+
+
 #------------------------------------------------------------
 # serialupdi
 #------------------------------------------------------------