diff --git a/ChangeLog b/ChangeLog
index c068f9c5d739d9aa7843f2c226f951580494a160..029a54666d5017a7b5955ebfa0a4392b2f0615c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2014-04-11 - Silvio Rhatto <rhatto@riseup.net>
+2014-05-16 - Silvio Rhatto <rhatto@riseup.net>
+
+	Use 'nobackup' and 'nowritebackup' if VIM is set as $EDITOR (#50)
 
 	Find: rollback: use find+grep instead of 'find -iname' (#53)
 
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 59777d0be8ec14e7df9d6d1c3bd9be0f07740e1d..50d01db29a00b0bbcbce22660db29d881698fb3f 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -287,7 +287,7 @@ function keyringer_set_env {
   # Avoid viminfo, see https://keyringer.pw/trac/ticket/50
   if $EDITOR --help | grep -q -e "^VIM"; then
     if ! echo $EDITOR | grep -q -- "-i NONE"; then
-      EDITOR="$EDITOR -i NONE"
+      EDITOR="$EDITOR -i NONE '+set nowritebackup' '+set nobackup'"
     fi
   fi