diff --git a/liberator/Makefile.common b/liberator/Makefile.common
index 06b7cbf2..323bc38d 100644
--- a/liberator/Makefile.common
+++ b/liberator/Makefile.common
@@ -104,7 +104,7 @@ $(JAR):
 
 #### doc
 
-${DOC_FILES}: %.html: %.txt Makefile.common locale/en-US/asciidoc.conf
+${DOC_FILES}: %.html: %.txt $(BASE)/Makefile.common locale/en-US/asciidoc.conf
 	@echo "DOC $@"
 	${ASCIIDOC} --unsafe -a linkcss -o $@ $<
 
diff --git a/liberator/process_manifest.awk b/liberator/process_manifest.awk
index 64072563..716f9e3a 100644
--- a/liberator/process_manifest.awk
+++ b/liberator/process_manifest.awk
@@ -1,7 +1,7 @@
 { content = $1 ~ /^(content|skin|locale)$/ }
-content && $NF ~ /^[a-z]/ { $NF = name "/" $NF }
+content && $NF ~ /^[a-z]/ { $NF = "/" name "/" $NF }
 content {
-    sub(/^\.\.\//, "", $NF);
+    sub(/^\.\./, "", $NF);
     $NF = "jar:chrome/" name ".jar!" $NF
 }
 {
diff --git a/muttator/Makefile b/muttator/Makefile
index 11862e34..49d5dd5c 100644
--- a/muttator/Makefile
+++ b/muttator/Makefile
@@ -3,4 +3,4 @@
 VERSION       = 0.5pre
 NAME          = muttator
 
-include Makefile.common
+include ../liberator/Makefile.common