Index: vim/src/os_unix.h
===================================================================
--- vim/src/os_unix.h.orig
+++ vim/src/os_unix.h
@@ -237,6 +237,9 @@
 /*
  * Unix system-dependent file names
  */
+#ifndef SYS_TINYRC_FILE
+# define SYS_TINYRC_FILE "$VIM/vimrc.tiny"
+#endif
 #ifndef SYS_VIMRC_FILE
 # define SYS_VIMRC_FILE "$VIM/vimrc"
 #endif
Index: vim/src/main.c
===================================================================
--- vim/src/main.c.orig
+++ vim/src/main.c
@@ -89,6 +89,9 @@
 #ifdef FEAT_DIFF
     int		diff_mode;		/* start with 'diff' set */
 #endif
+#ifdef SYS_TINYRC_FILE
+    int		vi_mode;		/* started as "vi" */
+#endif
 } mparm_T;
 
 /* Values for edit_type. */
@@ -1423,6 +1426,8 @@
     }
     else if (STRNICMP(initstr, "vim", 3) == 0)
 	initstr += 3;
+    else if (STRNICMP(initstr, "vi", 2) == 0)
+	parmp->vi_mode = TRUE;
 
     /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
     if (STRICMP(initstr, "diff") == 0)
@@ -2606,7 +2611,14 @@
 	 * Get system wide defaults, if the file name is defined.
 	 */
 #ifdef SYS_VIMRC_FILE
+# ifdef SYS_TINYRC_FILE
+	if (parmp->vi_mode)
+	    (void)do_source((char_u *)SYS_TINYRC_FILE,  FALSE, DOSO_NONE);
+	else
+	    (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+# else
 	(void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+# endif
 #endif
 #ifdef MACOS_X
 	(void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);