diff --git a/ChangeLog b/ChangeLog
index b122114d..6a333339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-18 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	Contributed by Julius Luukko <Julius.Luukko@lut.fi>:
+	* avrdude.conf.in: Add the "ere-isp-avr" programmer.
+
 2006-04-13 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* par.c: Add logic to negate parallel-port signals in
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 78764a57..001d43be 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -502,6 +502,16 @@ programmer
   miso  = ~10;
 ;
 
+programmer
+  id    = "ere-isp-avr";
+  desc  = "ERE ISP-AVR <http://www.ere.co.th/download/sch050713.pdf>"
+  type  = par;
+  reset = ~4;
+  sck   = 3;
+  mosi  = 2;
+  miso  = 10;
+;
+
 @HAVE_PARPORT_END@
 
 #