diff --git a/Makefile b/Makefile
index 47b5286..8f608aa 100644
--- a/Makefile
+++ b/Makefile
@@ -11,21 +11,18 @@
 DEPENDS = glibc
 ARCH = x86_64
 URL = http://www.infodrom.org/projects/sysklogd/
+BRIEF = The syslog and klog daemons
 DESC = This package implements two system log daemons. The syslogd daemon \
 is an enhanced version of the standard Berkeley utility program. The klogd \
 daemon listens to kernel message sources and is responsible for prioritizing \
 and processing operating system messages.
-SNAPVER = sr0
+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 = BINDIR=/sbin make install
-SNAPHACKS =
+VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')-$(SNAPVER)
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -49,8 +46,7 @@ $(SRCDIR)/syslogd: $(SRCDIR)/Makefile
 	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
 		patch --verbose -Np1 -i $$patch; \
 	done
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/syslogd
 	@if [ -d $(ROOT) ]; then \
@@ -59,10 +55,7 @@ $(ROOT): $(SRCDIR)/syslogd
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) BINDIR=/sbin
 
 test: $(ROOT)
 	@cd $(SRCDIR); \