diff --git a/common/Makefile.common b/common/Makefile.common
index 45103acd..2cf4fa09 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -42,7 +42,7 @@ AWK = awk
 
 TARGETS = all help info doc jar xpi install clean distclean $(JAR)
 $(TARGETS:%=\%.%):
-	echo "  MAKE" $* $(@:$*.%=%)
+	echo MAKE $* $(@:$*.%=%)
 	$(MAKE) -C $* $(@:$*.%=%)
 
 .PHONY: $(TARGETS)
@@ -74,24 +74,24 @@ jar: $(JAR)
 release: $(XPI) $(RDF)
 
 $(RDF): $(RDF_IN) Makefile
-	@echo "  Preparing release..."
+	@echo "Preparing release..."
 	$(SED) -e "s,###VERSION###,$(VERSION),g" \
 	           -e "s,###DATE###,$(BUILD_DATE),g" \
 	           < $< > $@
-	@echo "  SUCCESS: $@"
+	@echo "SUCCESS: $@"
 
 clean: $(LOCALES:%=%.clean)
-	@echo "  General $(NAME) cleanup..."
+	@echo "General $(NAME) cleanup..."
 	rm -f $(JAR) $(XPI)
 
 distclean: $(LOCALES:%=%.distclean) clean
-	@echo "  More $(NAME) cleanup..."
+	@echo "More $(NAME) cleanup..."
 	rm -rf $(BUILD_DIR)
 
 #### xpi
 
 $(XPI): $(JAR)
-	@echo "  Building XPI..."
+	@echo "Building XPI..."
 	mkdir -p $(XPI_PATH)
 	$(AWK) -v 'name=$(NAME)' -f $(BASE)/process_manifest.awk $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
 	$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
@@ -100,9 +100,9 @@ $(XPI): $(JAR)
 #### jar
 
 $(JAR): doc
-	@echo "  Building JAR..."
+	@echo "Building JAR..."
 	$(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
-	@echo "  SUCCESS: $@"
+	@echo "SUCCESS: $@"
 
 #### doc (see Makefile.doc)
 
diff --git a/common/Makefile.doc b/common/Makefile.doc
index e7cf6b81..fb9a43ee 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -6,7 +6,7 @@ ASCIIDOC      = asciidoc
 AWK           = awk
 
 LOCALE   = $(shell basename `pwd`)
-LANG     = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z]\{2\}$$/) ? $$1 : "en" }')
+LANG     = $(shell basename `pwd` | $(AWK) -F- '{ print ($$1 ~ /^[a-z][a-z]$$/) ? $$1 : "en" }')
 
 ADC_SRC_FILES = $(wildcard *.txt)
 ADC_FILES     = $(ADC_SRC_FILES:%.txt=%.html)