diff --git a/dkms b/dkms
index 54cd248e..b0c0cac9 100644
--- a/dkms
+++ b/dkms
@@ -1782,9 +1782,7 @@ do_uninstall()
             fi
         fi
     done
-    rm -rf "$dkms_tree/$module/kernel-$1-$2"
-    #Remove modules from dkms built tree
-    rm -rf "$dkms_tree/$module/$module_version/$1"
+    rm -f "$dkms_tree/$module/kernel-$1-$2"
     else
         echo $""
         echo $"Status: This module version was INACTIVE for this kernel."
diff --git a/kernel_prerm.d_dkms b/kernel_prerm.d_dkms
index c9a997ee..c8116a39 100755
--- a/kernel_prerm.d_dkms
+++ b/kernel_prerm.d_dkms
@@ -17,7 +17,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 uninstall -m $name -v $vers -k $inst_kern -a $arch
+   dkms remove -m $name -v $vers -k $inst_kern -a $arch
 done < <(dkms status -k $inst_kern 2>/dev/null | grep ": installed")
 fi