diff --git a/Makefile b/Makefile
index 6771c4e2..f744e9e2 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,9 @@ ${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES}
 		( echo "modified: $$f" ; \
 		  diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \
 	    done
+	# FIXME: VERSION and DATE tokens not replaced
+	${Q}${SED} -e 's,\(skin\|content\)/$$,jar:chrome/vimperator.jar!/\1/,' \
+	           < chrome.manifest > ${BUILD_XPI_DIR}/chrome.manifest
 	${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} )
 	@echo "SUCCESS: $@"
 
diff --git a/chrome.manifest b/chrome.manifest
index 73afa673..881c9687 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,3 +1,3 @@
-content	vimperator jar:chrome/vimperator.jar!/content/
-skin vimperator classic/1.0 jar:chrome/vimperator.jar!/skin/
+content	vimperator content/
+skin vimperator classic/1.0 skin/
 overlay chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul