diff --git a/avrdude/CHANGELOG b/avrdude/CHANGELOG
index f23d900f..b25e4124 100644
--- a/avrdude/CHANGELOG
+++ b/avrdude/CHANGELOG
@@ -4,6 +4,12 @@ Approximate change log for AVRPROG by version
 
 ----------------------------------------------------------------------
 
+Version 2.1.2:
+
+  * Add '-V' option to disable automatic verify check with uploading
+    data.
+
+
 Version 2.1.1:
 
   * Fix ATmega128 instruction sequences for reading fuse bits -
diff --git a/avrdude/avrdude.1 b/avrdude/avrdude.1
index 16668877..933ddcb1 100644
--- a/avrdude/avrdude.1
+++ b/avrdude/avrdude.1
@@ -48,6 +48,9 @@
 .Op Fl P Ar parallel
 .Op Fl t
 .Op Fl v
+.Op Fl V
+.Op Fl y
+.Op Fl Y
 .Sh DESCRIPTION
 .Nm Avrprog
 is a driver program for a simple programming hardware that allows one
@@ -124,14 +127,17 @@ the format.  Currently, the following MCU types are understood:
 .TS
 ll.
 \fBOption tag\fP	\fBOfficial part name\fP
+t15	ATtiny15
 1200	AT90S1200
 2313	AT90S2313
 2333	AT90S2333
+4414	AT90S4414
 4433	AT90S4433
 4434	AT90S4434
 8515	AT90S8515
 8535	AT90S8535
 m163	ATMEGA163
+m128	ATMEGA128
 m103	ATMEGA103
 m16	ATMEGA16
 m8	ATMEGA8
@@ -293,6 +299,10 @@ Tells
 .Nm
 to enter the interactive ``terminal'' mode instead of up- or downloading
 files.  See below for a detailed description of the terminal mode.
+.It Fl v
+Enable verbose output.
+.It Fl V
+Disable automatic verify check when uploading data.
 .It Fl y
 Tells
 .Nm
diff --git a/avrdude/main.c b/avrdude/main.c
index 5cf157f3..47b32096 100644
--- a/avrdude/main.c
+++ b/avrdude/main.c
@@ -115,7 +115,7 @@ char ** modules[N_MODULES] = {
   &term_version 
 };
 
-char * version      = "2.1.1";
+char * version      = "2.1.2";
 
 char * main_version = "$Id$";
 
@@ -516,7 +516,7 @@ int main(int argc, char * argv [])
   terminal      = 0;
   filefmt       = FMT_AUTO;
   nowrite       = 0;
-  verify        = 1;        /* on by default; XXX can't turn it off */
+  verify        = 1;        /* on by default */
   ppisetbits    = 0;
   ppiclrbits    = 0;
   exitspecs     = NULL;
@@ -571,7 +571,7 @@ int main(int argc, char * argv [])
   /*
    * process command line arguments
    */
-  while ((ch = getopt(argc,argv,"?c:C:eE:f:Fi:m:no:p:P:tvyY:")) != -1) {
+  while ((ch = getopt(argc,argv,"?c:C:eE:f:Fi:m:no:p:P:tvVyY:")) != -1) {
 
     switch (ch) {
       case 'c': /* pin configuration */
@@ -681,6 +681,10 @@ int main(int argc, char * argv [])
         verbose++;
         break;
 
+      case 'V':
+        verify = 0;
+        break;
+
       case 'y':
         do_cycles = 1;
         break;