diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 5d8bc516e1..1df05595ed 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -376,8 +376,6 @@ AddSymlinkToHaikuImage system bin : unzip : zipinfo ;
 AddSymlinkToHaikuImage system bin : gawk : awk ;
 AddSymlinkToHaikuImage system bin : grep : egrep ;
 AddSymlinkToHaikuImage system bin : grep : fgrep ;
-AddSymlinkToHaikuImage system bin : vim : vi ;
-AddSymlinkToHaikuImage system bin : vim : view ;
 
 
 # scripts and data files
@@ -427,9 +425,6 @@ SEARCH on <bash_completion>subversion =
 AddFilesToHaikuImage common etc bash_completion.d :
 	<bash_completion>subversion ;
 
-SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
-AddFilesToHaikuImage common etc vim : <etc>vimrc ;
-
 local dataFiles = teapot.data ;
 dataFiles = $(dataFiles:G=data) ;
 SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data system data ] ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 93d6bd20b0..0b3ee996db 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1083,6 +1083,11 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/common/bin/gvim ;
+		# TODO: move this symlink to the archive
+		AddSymlinkToHaikuImage common bin : vim : vi ;
+		# TODO: remove vimrc from the repository and add it to the archive
+		SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
+		AddFilesToHaikuImage common etc vim : <etc>vimrc ;
 	} else {
 		InstallOptionalHaikuImagePackage vim-7.2-r1a1-x86-gcc2-2009-09-06.zip
 			:  $(baseURL)/vim-7.2-r1a1-x86-gcc2-2009-09-06.zip
@@ -1090,6 +1095,11 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
 		;
 		AddSymlinkToHaikuImage home config be Applications
 			: /boot/common/bin/gvim ;
+		# TODO: move this symlink to the archive
+		AddSymlinkToHaikuImage common bin : vim : vi ;
+		# TODO: remove vimrc from the repository and add it to the archive
+		SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
+		AddFilesToHaikuImage common etc vim : <etc>vimrc ;
 	}
 }