The following changes were made:

* Compiled --with-spl=/usr/src/spl-$(VERSION) (location for spl-dev)
  * usher now manages etc/default/zfs
  * recompiled against correct kernel

Makefile

@@ -15,7 +15,7 @@ export URL = http://zfsonlinux.org/
 BRIEF = Module and utilities for the ZFS file system
 DESC = ZFS is an advanced file system and volume manager which was originally \
 developed for Solaris and is now maintained by the Illumos community.
-SNAPVER = 3
+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')
@@ -23,7 +23,7 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
 UPVER := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')
 export VERSION := $(UPVER)-$(SNAPVER)
-SPLPATH := $(shell readlink -f ../spl/spl-$(UPVER))
+SPLPATH := /usr/src/spl-$(UPVER)
 
 LIB := $(PWD)/libzfs
 LIBROOT := $(LIB)/ROOT
@@ -75,14 +75,18 @@ $(ROOT): $(SRCDIR)/module/zfs/zfs.ko
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR) && make install DESTDIR=$(ROOT)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	mv $(ROOT)/etc/default/zfs $(ROOT)/usr/share/zfs/zfs.default && \
+	rmdir $(ROOT)/etc/default && \
+	install -v -d -m 755 $(ROOT)/etc/zfs
 
 	@install -v -d $(LIB)/SNAP && \
 	install -v -d $(LIBROOT) && \
 	install -v -d -m 755 $(LIBROOT)/lib && \
 	install -v -d $(DEV)/SNAP && \
 	install -v -d $(DEVROOT) && \
-	mv -v $(ROOT)/lib/libzfs{_core,.so}* $(LIBROOT)/lib && \
+	mv -v $(ROOT)/lib/lib{nvpair,uutil,zfs,zfs_core,zpool}.{la,so}* \
+		$(LIBROOT)/lib && \
 	for file in `find $(ROOT)|egrep 'man3\/|\.a$$|\.c$$|\.h$$'`; do \
                 path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
                 mkdir -p $$path; \