diff --git a/dkms b/dkms
index 65286de5..37174459 100644
--- a/dkms
+++ b/dkms
@@ -1730,7 +1730,9 @@ do_uninstall()
             fi
         fi
     done
-    rm -f "$dkms_tree/$module/kernel-$1-$2"
+    rm -rf "$dkms_tree/$module/kernel-$1-$2"
+    #Remove modules from dkms built tree
+    rm -rf "$dkms_tree/$module/$module_version/$1"
     else
         echo $""
         echo $"Status: This module version was INACTIVE for this kernel."
diff --git a/dkms.spec b/dkms.spec
index 31690955..d9030280 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -139,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
 
 %post
-%systemd_post %{name}.service
+systemctl enable %{name}.service>/dev/null 2>&1
 
 %preun
 if [ $1 -eq 0 ]; then
diff --git a/kernel_prerm.d_dkms b/kernel_prerm.d_dkms
index 19dfd63c..f7224999 100755
--- a/kernel_prerm.d_dkms
+++ b/kernel_prerm.d_dkms
@@ -9,7 +9,7 @@ while read line; do
    vers=`echo "$line" | awk '{print $2}' | sed 's/,$//'`
    arch=`echo "$line" | awk '{print $4}' | sed 's/:$//'`
    echo "dkms: removing: $name $vers ($inst_kern) ($arch)" >&2
-   dkms remove -m $name -v $vers -k $inst_kern -a $arch
+   dkms uninstall -m $name -v $vers -k $inst_kern -a $arch
 done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
 fi