diff --git a/rpm/busybox-sailfish.config b/rpm/busybox-sailfish.config
index 3889817..c7e3db7 100644
--- a/rpm/busybox-sailfish.config
+++ b/rpm/busybox-sailfish.config
@@ -402,24 +402,24 @@ CONFIG_FEATURE_DIFF_DIR=y
 # CONFIG_ED is not set
 # CONFIG_PATCH is not set
 # CONFIG_SED is not set
-# CONFIG_VI is not set
-CONFIG_FEATURE_VI_MAX_LEN=0
-# CONFIG_FEATURE_VI_8BIT is not set
-# CONFIG_FEATURE_VI_COLON is not set
-# CONFIG_FEATURE_VI_YANKMARK is not set
-# CONFIG_FEATURE_VI_SEARCH is not set
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-# CONFIG_FEATURE_VI_USE_SIGNALS is not set
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-# CONFIG_FEATURE_VI_WIN_RESIZE is not set
-# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
-# CONFIG_FEATURE_VI_UNDO is not set
-# CONFIG_FEATURE_VI_UNDO_QUEUE is not set
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
-# CONFIG_FEATURE_ALLOW_EXEC is not set
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_REGEX_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_UNDO=y
+CONFIG_FEATURE_VI_UNDO_QUEUE=y
+CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
 # Finding Utilities
diff --git a/rpm/busybox.spec b/rpm/busybox.spec
index 4e70056..53bb165 100644
--- a/rpm/busybox.spec
+++ b/rpm/busybox.spec
@@ -61,8 +61,7 @@ is the symlinks implementing part of dosfstools.
 %package symlinks-gzip
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for gzip
-Provides: gzip = %{version}
-Obsoletes: gzip <= 1.5
+Provides: gzip
 
 %description symlinks-gzip
 Busybox is a single binary which includes versions of a large number
@@ -85,7 +84,7 @@ the symlinks implementing the dhcp utilities (udhcpc/udhcpcd).
 %package symlinks-diffutils
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for diffutils
-Provides: diffutils = %{version}
+Provides: diffutils
 Conflicts: gnu-diffutils
 
 %description symlinks-diffutils
@@ -98,7 +97,7 @@ is the symlinks implementing part of diffutils replacements.
 %package symlinks-findutils
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for findutils
-Provides: findutils = %{version}
+Provides: findutils
 Conflicts: gnu-findutils
 
 %description symlinks-findutils
@@ -111,7 +110,7 @@ is the symlinks implementing findutils replacements.
 %package symlinks-grep
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for grep
-Provides: grep = %{version}
+Provides: grep
 Provides: /bin/grep
 Conflicts: gnu-grep
 
@@ -138,7 +137,7 @@ the symlinks implementing cpio replacements.
 %package symlinks-tar
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for tar
-Provides: tar = %{version}
+Provides: tar
 Conflicts: gnu-tar
 
 %description symlinks-tar
@@ -148,10 +147,23 @@ useful for recovering from certain types of system failures,
 particularly those involving broken shared libraries. This
 is the symlink implementing tar replacement.
 
+%package symlinks-vi
+Requires: %{name} = %{version}-%{release}
+Summary: Busybox replacements for vi
+Provides: vi
+Conflicts: vim-minimal
+
+%description symlinks-vi
+Busybox is a single binary which includes versions of a large number
+of system commands, including a shell.  This package can be very
+useful for recovering from certain types of system failures,
+particularly those involving broken shared libraries. This
+is the symlink implementing vi replacement.
+
 %package symlinks-which
 Requires: %{name} = %{version}-%{release}
 Summary: Busybox replacements for which
-Provides: which = %{version}
+Provides: which
 Conflicts: util-linux <= 2.33+git1
 
 %description symlinks-which
@@ -201,6 +213,7 @@ cat >> busybox.links << EOF
 %{_bindir}/fgrep
 %{_bindir}/cpio
 %{_bindir}/tar
+%{_bindir}/vi
 EOF
 
 %install
@@ -293,6 +306,12 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
 /bin/tar
 %{_bindir}/tar
 
+%files symlinks-vi
+%defattr(-,root,root,-)
+/bin/vi
+%{_bindir}/vi
+
 %files symlinks-which
 %defattr(-,root,root,-)
 %{_bindir}/which
+