diff --git a/Makefile b/Makefile
index 6df1c46..651ca35 100644
--- a/Makefile
+++ b/Makefile
@@ -11,18 +11,15 @@
 DEPENDS = glibc,ncurses
 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 = sr1
+SNAPVER = 2
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
-
-MAKE = make
-MAKEINST = make install
-SNAPHACKS = 
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -45,8 +42,7 @@ $(SRCDIR)/ex: $(SRCDIR)/Makefile
 	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
 		patch --verbose -Np1 -i $$patch; \
 	done
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/ex
 	@if [ -d $(ROOT) ]; then \
@@ -55,10 +51,7 @@ $(ROOT): $(SRCDIR)/ex
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
 
 test: $(ROOT)
 	@cd $(SRCDIR); \