diff --git a/Makefile.lib b/Makefile.lib
index 8e2f90fe..fc7a40a2 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -126,15 +126,12 @@ CLEAN += $(PROG) $(OBJS)
 #############################################################################
 # The main default rules
 
-all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5)
+all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5) .vimrc
 
 # Ensure that Makefiles in subdirs are created before we recursive into them
 init-recursive: init-default
 
-init-default:
-	@{ echo ':set runtimepath+=.'; \
-	   echo ':runtime $(SRC)/config/vimrc'; \
-	} > .vimrc
+init-default: .vimrc
 	@$(foreach subdir,$(sort $(SUBDIRS)), \
 		$(MKINSTALLDIRS) $(subdir) >/dev/null; \
 		test -e "$(subdir)/Makefile" \
@@ -166,6 +163,10 @@ ifdef MAN5
 		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man5);)
 endif
 
+.vimrc: $(top_srcdir)/Makefile.lib
+	@{ echo ':set runtimepath+=.'; \
+	   echo ':runtime $(top_srcdir)/config/vimrc'; \
+	} > .vimrc
 
 ##############################################################################
 # Auto-testing infrastructure
diff --git a/configure.in b/configure.in
index cd1cda3f..e70b85e4 100644
--- a/configure.in
+++ b/configure.in
@@ -1349,12 +1349,12 @@ abs_srcdir="$(cd "$srcdir" && pwd)"
 if test "$abs_srcdir" != "$builddir"; then
 	# Bootstrap the Makefile creation
 	echo "include $abs_srcdir/Makefile" > "$builddir/Makefile"
+	"$MAKE" "SRC=$abs_srcdir" init
+
 	# Make cg-status ignore this build directory
 	echo "*" > "$builddir/.gitignore"
 fi
 
-"$MAKE" "SRC=$abs_srcdir" init
-
 dnl ===================================================================
 dnl Configuration summary
 dnl ===================================================================