diff --git a/Makefile b/Makefile
index b446b07..2e7ca37 100644
--- a/Makefile
+++ b/Makefile
@@ -8,22 +8,19 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = acl,attr,glibc
+DEPENDS = glibc,libacl,libattr
 ARCH = x86_64
 URL = https://www.gnu.org/software/tar/
+BRIEF = Archive utility
 DESC = GNU Tar provides the ability to create tar archives, as well as \
 various other kinds of manipulation
-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 = rm -v $(ROOT)/usr/share/info/dir
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -59,8 +56,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/src/tar: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/src/tar
 	@if [ -d $(ROOT) ]; then \
@@ -69,14 +65,11 @@ $(ROOT): $(SRCDIR)/src/tar
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
-	@cd $(SRCDIR); \
-	make check
+	@cd $(SRCDIR) && make check
 
 clean:
 	@rm -rvf $(ROOT) \