diff --git a/zfs.spec b/zfs.spec
index db8d72a..30778d6 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -1,5 +1,5 @@
 Name:          zfs
-Version:       0.6.5.7
+Version:       0.6.5.8
 Release:       1mamba
 Summary:       An advanced file system and volume manager
 Group:         System/Tools
@@ -7,7 +7,8 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://zfsonlinux.org
-Source:        http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-%{version}.tar.gz
+Source:        https://github.com/zfsonlinux/zfs.git/zfs-%{version}/zfs-%{version}.tar.bz2
+#Source:        http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-%{version}.tar.gz
 License:       Common Development and Distribution License
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -44,6 +45,7 @@ This package contains libraries and header files for developing applications tha
 %setup -q
 
 %build
+./autogen.sh
 %configure \
    --disable-sysvinit \
    --with-config=user \
@@ -82,11 +84,7 @@ This package contains libraries and header files for developing applications tha
 %{_prefix}/lib/dracut/modules.d/90zfs/*
 %{_prefix}/lib/modules-load.d/zfs.conf
 %{_presetdir}/50-zfs.preset
-%{_unitdir}/zed.service
-%{_unitdir}/zfs-import-cache.service
-%{_unitdir}/zfs-import-scan.service
-%{_unitdir}/zfs-mount.service
-%{_unitdir}/zfs-share.service
+%{_unitdir}/zfs-*.service
 %{_unitdir}/zfs.target
 %{_sbindir}/fsck.zfs
 %{_sbindir}/zdb
@@ -185,6 +183,9 @@ This package contains libraries and header files for developing applications tha
 #%doc README.markdown
 
 %changelog
+* Mon Oct 17 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.5.8-1mamba
+- update to 0.6.5.8
+
 * Sat May 14 2016 Automatic Build System <autodist@mambasoft.it> 0.6.5.7-1mamba
 - automatic version update by autodist