--- Src/Makefile.in.orig
+++ Src/Makefile.in
@@ -149,14 +149,7 @@ uninstall.bin: uninstall.bin-here
 # install binary, creating install directory if necessary
 install.bin-here: zsh$(EXEEXT) $(INSTLIB)
 	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
-	if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
-	    rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
-	    $(LN) $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).old; \
-	else :; fi
-	rm -f $(DESTDIR)$(bindir)/$(tzsh).new
-	$(LN) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh).new
-	mv $(DESTDIR)$(bindir)/$(tzsh).new $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT)
+	$(INSTALL_PROGRAM) $(STRIPFLAGS) zsh $(DESTDIR)$(bindir)/zsh
 .PHONY: install.bin-here
 
 install.bin-N:
--- Src/Modules/terminfo.c.orig
+++ Src/Modules/terminfo.c
@@ -28,6 +28,7 @@
  */
 
 #define USES_TERM_H 1
+#include <ncurses.h>
 #include "terminfo.mdh"
 
 #if defined(HAVE_TIGETFLAG) && defined(ZSH_HAVE_CURSES_H)