diff -r 6a5946fbc728 -r 464128a8fc3f config/binutils/binutils.in.2
--- a/config/binutils/binutils.in.2	Mon Nov 19 11:21:31 2012 +0100
+++ b/config/binutils/binutils.in.2	Sun May 11 15:43:28 2014 +0200
@@ -7,12 +7,10 @@
 choice
     bool
     prompt "elf2flt version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
 
-config ELF2FLT_CVSHEAD
+config ELF2FLT_GIT
     bool
-    prompt "CVS Head"
+    prompt "git"
     help
       Grab the latest version of elf2flt from the CVS repository
 
@@ -23,8 +21,30 @@
 
 endchoice
 
+config ELF2FLT_VERSION
+    string
+
+if ELF2FLT_GIT
+
+config ELF2FLT_GIT_CSET
+    string
+    prompt "git cset"
+    default "21c6a41885ad544763ccd19883c1353f3b0b7a47"
+    help
+      Enter the git changeset to use.
+
+      The default currently points to the HEAD of the git tree.
+
+config ELF2FLT_VERSION
+    default ELF2FLT_GIT_CSET
+
+endif # ELF2FLT_GIT
+
 if ELF2FLT_CUSTOM
 
+config ELF2FLT_VERSION
+    default "custom"
+
 config ELF2FLT_CUSTOM_LOCATION
     string
     prompt "Full path to custom elf2flt source"
@@ -35,13 +55,6 @@
 
 endif # ELF2FLT_CUSTOM
 
-config ELF2FLT_VERSION
-    string
-    default "cvs" if ELF2FLT_CVSHEAD
-    default "custom" if ELF2FLT_CUSTOM
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-
 config ELF2FLT_EXTRA_CONFIG_ARRAY
     string
     prompt "elf2flt extra config"