diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index a5f0fc00..3c810ba6 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-21  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* main.c: Add the forgotten -B option to the option string in
+	getopt(); sort the -s option into order.
+
 2005/09/21  Brian S. Dean  <bsd@bsdhome.com>
 
 	* avr.c:
diff --git a/avrdude/main.c b/avrdude/main.c
index 98dcd5fa..29d20742 100644
--- a/avrdude/main.c
+++ b/avrdude/main.c
@@ -835,7 +835,7 @@ int main(int argc, char * argv [])
   /*
    * process command line arguments
    */
-  while ((ch = getopt(argc,argv,"?b:c:C:DeE:Fnp:P:qtU:suvVyY:")) != -1) {
+  while ((ch = getopt(argc,argv,"?b:B:c:C:DeE:Fnp:P:qstU:uvVyY:")) != -1) {
 
     switch (ch) {
       case 'b': /* override default programmer baud rate */
@@ -1163,7 +1163,7 @@ int main(int argc, char * argv [])
     if (verbose) {
       fprintf(stderr, "%sSetting bit clk period: %.1f\n", progbuf, bitclock);
     }
-    pgm->bitclock = bitclock;
+    pgm->bitclock = bitclock * 1e-6;
   }
 
   rc = pgm->open(pgm, port);