diff --git a/BUGS b/BUGS
index 1904baa..29311fa 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,7 @@
+BUG:
+
+
+
 Email Will Clinger regarding:
 
 Larceny v0.93 "Deviated Prevert" (Nov 10 2006 04:27:45, precise:BSD
diff --git a/src/ikarus.boot b/src/ikarus.boot
index d5243bf..e46ab0b 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/ikarus.vectors.ss b/src/ikarus.vectors.ss
index 92057bf..6aace01 100644
--- a/src/ikarus.vectors.ss
+++ b/src/ikarus.vectors.ss
@@ -1,11 +1,11 @@
 
 (library (ikarus vectors)
   (export make-vector vector vector-length vector-ref vector-set!
-          vector->list list->vector)
+          vector->list list->vector vector-map)
   (import 
     (except (ikarus) make-vector vector 
             vector-length vector-ref vector-set!
-            vector->list list->vector)
+            vector->list list->vector vector-map)
     (ikarus system $fx)
     (ikarus system $pairs)
     (ikarus system $vectors))
@@ -119,5 +119,76 @@
            (let ([v (make-vector n)])
              (fill v 0 ls))))))
 
+  (module (vector-map)
+    (define who 'vector-map)
+    (define (ls->vec ls n) 
+      (let f ([v ($make-vector n)]
+              [n n]
+              [ls ls])
+        (cond
+          [(null? ls) v]
+          [else
+           (let ([n ($fxsub1 n)])
+             ($vector-set! v n ($car ls))
+             (f v n ($cdr ls)))])))
+    (define vector-map
+      (case-lambda
+        [(p v) 
+         (unless (procedure? p) 
+           (error who "~s is not a procedure" p))
+         (unless (vector? v) 
+           (error who "~s is not a vector" v))
+         (let f ([p p] [v v] [i 0] [n (vector-length v)] [ac '()])
+           (cond
+             [($fx= i n) (ls->vec ac n)]
+             [else 
+              (f p v ($fxadd1 i) n (cons (p (vector-ref v i)) ac))]))]
+        [(p v0 v1) 
+         (unless (procedure? p) 
+           (error who "~s is not a procedure" p))
+         (unless (vector? v0) 
+           (error who "~s is not a vector" v0))
+         (unless (vector? v1) 
+           (error who "~s is not a vector" v1))
+         (let ([n (vector-length v0)])
+           (unless ($fx= n ($vector-length v1))
+             (error who "length mismatch between ~s and ~s" v0 v1))
+           (let f ([p p] [v0 v0] [v1 v1] [i 0] [n n] [ac '()])
+             (cond
+               [($fx= i n) (ls->vec ac n)]
+               [else 
+                (f p v0 v1 ($fxadd1 i) n 
+                   (cons (p ($vector-ref v0 i) ($vector-ref v1 i)) ac))])))]
+        [(p v0 v1 . v*) 
+         (unless (procedure? p) 
+           (error who "~s is not a procedure" p))
+         (unless (vector? v0) 
+           (error who "~s is not a vector" v0))
+         (unless (vector? v1) 
+           (error who "~s is not a vector" v1))
+         (let ([n (vector-length v0)])
+           (unless ($fx= n ($vector-length v1))
+             (error who "length mismatch between ~s and ~s" v0 v1))
+           (let f ([v* v*] [n n])
+             (unless (null? v*) 
+               (let ([a ($car v*)])
+                 (unless (vector? a) 
+                   (error who "~s is not a vector" a))
+                 (unless ($fx= ($vector-length a) n) 
+                   (error who "length mismatch")))
+               (f ($cdr v*) n)))
+           (let f ([p p] [v0 v0] [v1 v1] [v* v*] [i 0] [n n] [ac '()])
+             (cond
+               [($fx= i n) (ls->vec ac n)] 
+               [else 
+                (f p v0 v1 v* ($fxadd1 i) n 
+                   (cons 
+                     (apply p ($vector-ref v0 i) ($vector-ref v1 i)
+                       (let f ([i i] [v* v*]) 
+                         (if (null? v*) 
+                             '()
+                             (cons ($vector-ref ($car v*) i) 
+                                   (f i ($cdr v*))))))
+                     ac))])))])))
 
   )
diff --git a/src/makefile.ss b/src/makefile.ss
index 734f7a3..4dffb7b 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -347,6 +347,7 @@
     [vector-length           i r]
     [list->vector            i r]
     [vector->list            i r]
+    [vector-map              i r]
     [make-bytevector         i]
     [bytevector-length       i]
     [bytevector-s8-ref       i]
diff --git a/src/todo-r6rs.ss b/src/todo-r6rs.ss
index aff46ea..f7b38fc 100755
--- a/src/todo-r6rs.ss
+++ b/src/todo-r6rs.ss
@@ -225,7 +225,7 @@
     [vector-fill!                               S ba]
     [vector-for-each                            S ba]
     [vector-length                              C ba]
-    [vector-map                                 S ba]
+    [vector-map                                 C ba]
     [vector-ref                                 C ba]
     [vector-set!                                C ba]
     [vector?                                    C ba]