diff --git a/Makefile b/Makefile
index 05a42ad..25044cc 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ ARCH = x86_64
 URL = http://ex-vi.sourceforge.net/
 BRIEF = Text editor
 DESC = The vi editor is one of the most common text editors on Unix.
-SNAPVER = 6
+SNAPVER = 7
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -52,10 +52,8 @@ $(ROOT): $(SRCDIR)/ex
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
-
-test: $(ROOT)
-#	@cd $(SRCDIR) && make test
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	install -v -d -m 1777 $(ROOT)/tmp
 
 clean:
 	@rm -rvf $(ROOT) \
diff --git a/SRC/patches/04_change-tmp.patch b/SRC/patches/04_change-tmp.patch
new file mode 100644
index 0000000..25b6f87
--- /dev/null
+++ b/SRC/patches/04_change-tmp.patch
@@ -0,0 +1,56 @@
+diff -Naur a/ex.1 b/ex.1
+--- a/ex.1	2005-02-17 06:39:36.000000000 -0600
++++ b/ex.1	2017-04-22 12:10:54.272000000 -0500
+@@ -1944,10 +1944,10 @@
+ .B $HOME/.exrc
+ editor startup file
+ .TP
+-.B /var/tmp/Ex\fInnnnnnnnnn\fP
++.B /tmp/Ex\fInnnnnnnnnn\fP
+ editor temporary
+ .TP
+-.B /var/tmp/Rx\fInnnnnnnnnn\fP
++.B /tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+ .B /var/preserve
+diff -Naur a/expreserve.c b/expreserve.c
+--- a/expreserve.c	2005-03-04 06:44:46.000000000 -0600
++++ b/expreserve.c	2017-04-22 12:12:30.200000000 -0500
+@@ -149,7 +149,7 @@
+ #ifdef	notdef
+ #define TMP	"/tmp"
+ #else
+-#define	TMP	"/var/tmp"
++#define	TMP	"/tmp"
+ #endif
+ 
+ #ifndef VMUNIX
+diff -Naur a/exrecover.c b/exrecover.c
+--- a/exrecover.c	2005-03-04 06:44:46.000000000 -0600
++++ b/exrecover.c	2017-04-22 12:12:50.640000000 -0500
+@@ -121,7 +121,7 @@
+ #endif
+ #endif
+ 
+-#define	TMP		"/var/tmp"
++#define	TMP		"/tmp"
+ 
+ #ifdef	LANGMSG
+ nl_catd	catd;
+diff -Naur a/vi.1 b/vi.1
+--- a/vi.1	2005-02-17 06:39:36.000000000 -0600
++++ b/vi.1	2017-04-22 12:11:10.640000000 -0500
+@@ -973,10 +973,10 @@
+ .B $HOME/.exrc
+ editor startup file
+ .TP
+-.B /var/tmp/Ex\fInnnnnnnnnn\fP
++.B /tmp/Ex\fInnnnnnnnnn\fP
+ editor temporary
+ .TP
+-.B /var/tmp/Rx\fInnnnnnnnnn\fP
++.B /tmp/Rx\fInnnnnnnnnn\fP
+ named buffer temporary
+ .TP
+ .B /var/preserve