diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index dc85041bcf36..52894102ee1e 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -152,15 +152,18 @@ post-install:
 	${TEST} -e ${STAGEDIR}${PREFIX}/bin/${file} || ${LN} -fs vim ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .endif
-.if ${PORT_OPTIONS:MDEFAULT_VIMRC}
+
+post-install-DEFAULT_VIMRC-on:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/gvimrc.sample
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample
-.endif
-.if !${PORT_OPTIONS:MNLS}
+
+post-install-NLS-off:
 	${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
 	${INSTALL_DATA} ${WRKSRC}/runtime/keymap/* ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
-.endif
+	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
+
+post-install-NLS-on:
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
 
 .include <bsd.port.post.mk>