diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index b0fdbb6a99..740997a991 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -151,7 +151,11 @@
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
+#ifndef ZEN_VISION
 #define BOOTFILE_EXT "zvm"
+#else
+#define BOOTFILE_EXT "zv"
+#endif
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
@@ -169,8 +173,4 @@
 
 #define DO_THREAD_TEST
 #endif
-
-
-//Uncomment next line to make this build Zen Vision compatible
-//#define ZEN_VISION
 #endif
diff --git a/tools/configure b/tools/configure
index 6af5b92508..7d100a5245 100755
--- a/tools/configure
+++ b/tools/configure
@@ -678,6 +678,7 @@ cat <<EOF
                        71) M:Robe 100
  ==Creative==
  90) Zen Vision:M
+ 91) Zen Vision
 
 EOF
 
@@ -1474,6 +1475,30 @@ fi
     t_manufacturer="tms320dm320"
     t_model="creative-zvm"
     ;;
+    
+    91|creativezenvision)
+    target_id=35
+    modelname="creativezm"
+    target="-DCREATIVE_ZVM -DZEN_VISION"
+    memory=64
+    arm926ejscc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0"
+    tool="$rootdir/tools/scramble -creative=zenvision"
+    output="rockbox.zv"
+    appextra="recorder:gui"
+    plugins=""
+    swcodec="yes"
+    toolset=$ipodbitmaptools
+    boottool="$rootdir/tools/scramble -creative=zenvision"
+    bootoutput="rockbox.zv"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="tms320dm320"
+    t_model="creative-zvm"
+    ;;
 
    50|e200)
     target_id=23