diff --git a/.zfs-linux.metadata b/.zfs-linux.metadata
index 2fdb2b7..556fa10 100644
--- a/.zfs-linux.metadata
+++ b/.zfs-linux.metadata
@@ -1,4 +1,5 @@
-a0a227d81af220a1d81a6d76b6279c942b4191d4  src/spl/spl-0.6.2.tar.gz
-b1f67d1d18a3475f547ef180084a2cc10179fcd9  src/spl/spl-0.6.3.tar.gz
-7b8315a6b92682058b0c316a4d16d3dbd4aee032  src/zfs/zfs-0.6.2.tar.gz
-b699e611c726aebc3882fa3d8d9eab4101fa4911  src/zfs/zfs-0.6.3.tar.gz
+e70261323b573f0379bc94a0fd9821212a8d6b0b  src/spl/spl-0.6.3-1.2.tar.gz
+14ddd75699a5690297f4d0381833f469b16b50f2  src/spl/spl-0.6.3-1.3.tar.gz
+c8ddd2c9ecfde257cb8e99dbee19f242ca89c993  src/zfs/zfs-0.6.3-1.2.tar.gz
+eefd4ee45b4f0fad4547e678cc948cbaf8bf0854  src/zfs/zfs-0.6.3-gcff8fdc3.tar.gz
+3452393e2c9aaf4adcf332e3c97184373751bb11  src/zfs/zfs-0.6.3-1.3.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
index 09258df..db0ba71 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -79,6 +79,8 @@ https://github.com/rocksclusters-attic"
 	exit 1
 fi
 
+export SURL=http://forge.sdsc.edu/triton
+
 . $ROLLSROOT/etc/bootstrap-functions.sh
 
 if [ `./_os` == "linux" ]; then
diff --git a/src/spl/Makefile b/src/spl/Makefile
index ed7c61d..1915086 100644
--- a/src/spl/Makefile
+++ b/src/spl/Makefile
@@ -68,7 +68,6 @@ TAR = /bin/tar
 ARCH = $(shell /bin/uname -p)
 REDHAT.ROOT = $(CURDIR)/../../
 
-
 Makefile: zfs-version.mk
 
 zfs-version.mk:
@@ -76,11 +75,12 @@ zfs-version.mk:
 
 
 rpm pkg: RPMDIRS
-	gunzip -c $(NAME)-$(VERSION)$(RC)$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
+	gunzip -c $(NAME)-$(VERSION)$(RC)-$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
 	( 								\
-		cd $(NAME)-$(VERSION)$(RC)$(RELEASE);				\
+		cd $(NAME)-$(NAME)-$(VERSION)$(RC)-$(RELEASE);		\
+		./autogen.sh;						\
 		./configure;						\
-		$(MAKE) rpm;						\
+		$(MAKE) rpms;						\
 		/bin/cp *$(ARCH).rpm $(REDHAT.ROOT)/RPMS/$(ARCH);	\
 		/bin/cp *src.rpm $(REDHAT.ROOT)/SRPMS;	\
 	)
diff --git a/src/spl/version.mk b/src/spl/version.mk
index 26c6f84..06ac1ca 100644
--- a/src/spl/version.mk
+++ b/src/spl/version.mk
@@ -3,5 +3,5 @@ include zfs-version.mk
 NAME    	= spl
 VERSION 	= $(SPL_VERSION)
 RC		= 
-RELEASE 	= 
+RELEASE 	= $(SPL_RELEASE)
 TARBALL_POSTFIX	= tar.gz
diff --git a/src/zfs/Makefile b/src/zfs/Makefile
index 343a84f..4d7dd40 100644
--- a/src/zfs/Makefile
+++ b/src/zfs/Makefile
@@ -74,11 +74,12 @@ zfs-version.mk:
 	if [ -e ../../zfs-version.mk ]; then /bin/cp ../../zfs-version.mk .; fi 
 
 rpm pkg: RPMDIRS buildreqs
-	gunzip -c $(NAME)-$(VERSION)$(RC)$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
+	gunzip -c $(NAME)-$(VERSION)$(RC)-$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
 	( 								\
-		cd $(NAME)-$(VERSION)$(RC)$(RELEASE);				\
+		cd $(NAME)-$(NAME)-$(VERSION)$(RC)-$(RELEASE);		\
+		./autogen.sh;						\
 		./configure;						\
-		$(MAKE) rpm;						\
+		$(MAKE) rpms;						\
 		/bin/cp *$(ARCH).rpm $(REDHAT.ROOT)/RPMS/$(ARCH);	\
 		/bin/cp *src.rpm $(REDHAT.ROOT)/SRPMS;	\
 	)
diff --git a/src/zfs/version.mk b/src/zfs/version.mk
index 18511bb..491fd3a 100644
--- a/src/zfs/version.mk
+++ b/src/zfs/version.mk
@@ -3,5 +3,5 @@ include zfs-version.mk
 NAME    	= zfs
 VERSION		= $(ZFS_VERSION)
 RC		= 
-RELEASE 	= 
+RELEASE 	= $(ZFS_RELEASE)
 TARBALL_POSTFIX	= tar.gz
diff --git a/zfs-version.mk b/zfs-version.mk
index 492cd2e..5cf67c6 100644
--- a/zfs-version.mk
+++ b/zfs-version.mk
@@ -1,2 +1,4 @@
 ZFS_VERSION = 0.6.3
+ZFS_RELEASE = 1.3
 SPL_VERSION = 0.6.3
+SPL_RELEASE = 1.3
\ No newline at end of file