diff --git a/HISTORY b/HISTORY
index 8ff1528..355c109 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,8 @@
 Version history: 0.86
- * Add support for latest kdecvs-build.
+ * Add support for latest unsermake.
+ * make options are no longer added when installing, it seems to confuse
+   unsermake, and is only really useful for parallel builds anyways,
+   which doesn't matter when installing.
 
 Version history: 0.85
  * Fix bug where packages are built in reverse order. :-(
diff --git a/doc.html.in b/doc.html.in
index e580764..e09db86 100644
--- a/doc.html.in
+++ b/doc.html.in
@@ -69,8 +69,11 @@ those who either can't or don't feel like installing it.</p>
 New features:
 <ul>
 <li>kdecvs-build has been updated to work the latest unsermake from kdenonbeta.
-I think that it should still work with the old unsermake, but I can't check.
+Note that the old unsermake will no longer work.  kdecvs-build by default automatically
+updates unsermake and uses the latest version, so this change shouldn't affect you much.
 </li>
+<li>Don't append make options to the make command when installing anymore, as sometimes it
+seems to confuse unsermake.</li>
 </ul>
 
 <p><b>2004-Sep-20:</b> v0.85<br/>
diff --git a/kdecvs-build b/kdecvs-build
index 9f16b9e..452743b 100755
--- a/kdecvs-build
+++ b/kdecvs-build
@@ -402,8 +402,10 @@ sub safe_make (@)
     my $installing = $trynumber eq 'install';
     my $make = 'make';
 
-    # Add make-options to the given options
-    unshift (@_, split(' ', $opts));
+    # Add make-options to the given options, as long as we're not installing
+    # If we are installing, unsermake seems to assume that the options are a
+    # make target, and parallel builds don't help with installing anyways.
+    unshift (@_, split(' ', $opts)) unless $installing;
 
     $make = 'unsermake' if get_option($module, 'use-unsermake');