diff --git a/pkgs/development/compilers/qcmm/builder.sh b/pkgs/development/compilers/qcmm/builder.sh
index c1850306cc2..dd08d483409 100644
--- a/pkgs/development/compilers/qcmm/builder.sh
+++ b/pkgs/development/compilers/qcmm/builder.sh
@@ -6,17 +6,26 @@ MKFLAGS="-w$lua/include/lauxlib.h,$lua/include/luadebug.h,$lua/include/lua.h,$lu
 
 buildPhase() {
   mk timestamps
-  mk $MKFLAGS all all.opt
+  mk $MKFLAGS all.opt
 }
 
 installPhase() {
-mk $MKFLAGS install install.opt
-find $out -name \*.a -exec echo stripping {} \; \
+  mk $MKFLAGS install.opt
+
+  for file in $out/bin/*.opt; do
+    mv $file ${file%.opt}
+  done
+
+  find $out/man -type f -exec gzip -9 {} \;
+
+  find $out -name \*.a -exec echo stripping {} \; \
             -exec strip -S {} \; || fail
-patchELF $out
+
+  patchELF $out
 }
 
 buildPhase=buildPhase
 installPhase=installPhase
+checkPhase="mk $MKFLAGS test.opt"
 
 genericBuild
diff --git a/pkgs/development/compilers/qcmm/qcmm.patch b/pkgs/development/compilers/qcmm/qcmm.patch
index 570d87d5fee..414f18a9f73 100644
--- a/pkgs/development/compilers/qcmm/qcmm.patch
+++ b/pkgs/development/compilers/qcmm/qcmm.patch
@@ -107,3 +107,15 @@ diff -ur qc--20060131.orig/doc/mkfile qc--20060131/doc/mkfile
  
  release.tex:D: release.nw
  	noweave -delay $prereq > $target
+diff -ur qc--20060131.orig/mkfile qc--20060131/mkfile
+--- qc--20060131.orig/mkfile	2005-07-01 22:29:52.000000000 +0200
++++ qc--20060131/mkfile	2006-02-02 19:15:53.000000000 +0100
+@@ -97,7 +97,7 @@
+ 	cd test2 && NPROC=1 mk $MKFLAGS all
+ 
+ test.opt:V:         all.opt
+-	cd test2 && NPROC=1 mk QC=../bin/qc--.opt $MKFLAGS all
++	cd test2 && NPROC=1 mk $MKFLAGS QC=../bin/qc--.opt all
+ 
+ coverage: test2/ocamlprof.dump	
+ 	rm -f $target