diff --git a/Makefile b/Makefile
index 4fb9918..8e25bab 100644
--- a/Makefile
+++ b/Makefile
@@ -8,25 +8,20 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = acl,attr,glibc,ncurses
+DEPENDS = glibc,libacl,libattr,ncurses
 ARCH = x86_64
 URL = http://www.vim.org/
+BRIEF = Clone of vi with extended features
 DESC = Vim is an advanced text editor that seeks to provide the power of \
 the de-facto Unix editor 'Vi', with a more complete feature set.
-SNAPVER = sr3
+SNAPVER = 4
 
 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 $(ARCHIVE)|sed 's/\.tar.*//'| \
-	egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
-
-MAKE = make
-MAKEINST = make install
-SNAPHACKS = ln -sv vim $(ROOT)/usr/bin/vi && \
-	mkdir -v $(ROOT)/etc && \
-	echo "colorscheme slate" > $(ROOT)/etc/vimrc
+	egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -59,8 +54,7 @@ $(SRCDIR)/src/auto/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/src/vim: $(SRCDIR)/src/auto/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/src/vim
 	@if [ -d $(ROOT) ]; then \
@@ -69,10 +63,10 @@ $(ROOT): $(SRCDIR)/src/vim
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	ln -sv vim $(ROOT)/usr/bin/vi && \
+	mkdir -v $(ROOT)/etc && \
+	echo "colorscheme slate" > $(ROOT)/etc/vimrc
 
 test: $(ROOT)
 	@cd $(SRCDIR); \