-ZFSVER=0.7.2
-ZFSPKGREL=pve1~bpo90
-SPLPKGREL=pve1~bpo90
-ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
-SPLPKGVER=${ZFSVER}-${SPLPKGREL}
-
-SPLDIR=spl-build
-SPLSRC=spl-debian
-ZFSDIR=zfs-build
-ZFSSRC=zfs-debian
-
-SPL_DEBS= \
-spl_${SPLPKGVER}_amd64.deb
-
-ZFS_DEBS= \
-libnvpair1linux_${ZFSPKGVER}_amd64.deb \
-libuutil1linux_${ZFSPKGVER}_amd64.deb \
-libzfs2linux_${ZFSPKGVER}_amd64.deb \
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb \
-libzpool2linux_${ZFSPKGVER}_amd64.deb \
-zfs-dbg_${ZFSPKGVER}_amd64.deb \
-zfs-zed_${ZFSPKGVER}_amd64.deb \
-zfs-initramfs_${ZFSPKGVER}_all.deb \
-zfs-test_${ZFSPKGVER}_amd64.deb \
-zfsutils-linux_${ZFSPKGVER}_amd64.deb
-
-DEBS=${SPL_DEBS} ${ZFS_DEBS}
+PACKAGE = zfs-linux
+
+SRCDIR = upstream
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+ORIG_SRC_TAR = $(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+
+ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
+
+ZFS_DEB_BINARY = \
+libpam-zfs_$(DEB_VERSION)_amd64.deb \
+libuutil3linux_$(DEB_VERSION)_amd64.deb \
+libzfs4linux_$(DEB_VERSION)_amd64.deb \
+libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb \
+libzpool5linux_$(DEB_VERSION)_amd64.deb \
+zfs-test_$(DEB_VERSION)_amd64.deb \
+zfsutils-linux_$(DEB_VERSION)_amd64.deb \
+zfs-zed_$(DEB_VERSION)_amd64.deb
+
+ZFS_DBG_DEBS = $(patsubst %_$(DEB_VERSION)_amd64.deb, %-dbgsym_$(DEB_VERSION)_amd64.deb, $(ZFS_DEB1) $(ZFS_DEB_BINARY))
+
+ZFS_DEB2= $(ZFS_DEB_BINARY) \
+libzfslinux-dev_$(DEB_VERSION)_amd64.deb \
+python3-pyzfs_$(DEB_VERSION)_amd64.deb \
+pyzfs-doc_$(DEB_VERSION)_all.deb \
+spl_$(DEB_VERSION)_all.deb \
+zfs-initramfs_$(DEB_VERSION)_all.deb
+DEBS= $(ZFS_DEB1) $(ZFS_DEB2) $(ZFS_DBG_DEBS)
+
+ZFS_DSC = zfs-linux_$(DEB_VERSION).dsc