diff --git a/mozilla/htmlparser/src/Makefile b/mozilla/htmlparser/src/Makefile
index 1f7aee27823..0c09ade486a 100644
--- a/mozilla/htmlparser/src/Makefile
+++ b/mozilla/htmlparser/src/Makefile
@@ -49,6 +49,10 @@ EXPORTS =     \
   COtherDTD.h \
   $(NULL)
 
+EXTRA_EXPORTS =					\
+	nsHTMLTags.h				\
+	$(NULL)
+
 MODULE = raptor
 
 REQUIRES = xpcom netlib raptor
@@ -56,3 +60,16 @@ REQUIRES = xpcom netlib raptor
 include $(DEPTH)/config/config.mk
 
 include $(DEPTH)/config/rules.mk
+
+export:: generate
+	$(INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)/$(MODULE)
+
+generate: nsHTMLTags.h
+
+$(OBJDIR)/nsHTMLTags.o: nsHTMLTags.h
+
+GENTAGS = $(DEPTH)/htmlparser/tools/gentags.pl
+
+nsHTMLTags.h: $(GENTAGS)
+	rm -f nsHTMLTags.h nsHTMLTags.cpp
+	$(PERL) $(GENTAGS) nsHTMLTags
diff --git a/mozilla/parser/htmlparser/src/Makefile b/mozilla/parser/htmlparser/src/Makefile
index 1f7aee27823..0c09ade486a 100644
--- a/mozilla/parser/htmlparser/src/Makefile
+++ b/mozilla/parser/htmlparser/src/Makefile
@@ -49,6 +49,10 @@ EXPORTS =     \
   COtherDTD.h \
   $(NULL)
 
+EXTRA_EXPORTS =					\
+	nsHTMLTags.h				\
+	$(NULL)
+
 MODULE = raptor
 
 REQUIRES = xpcom netlib raptor
@@ -56,3 +60,16 @@ REQUIRES = xpcom netlib raptor
 include $(DEPTH)/config/config.mk
 
 include $(DEPTH)/config/rules.mk
+
+export:: generate
+	$(INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)/$(MODULE)
+
+generate: nsHTMLTags.h
+
+$(OBJDIR)/nsHTMLTags.o: nsHTMLTags.h
+
+GENTAGS = $(DEPTH)/htmlparser/tools/gentags.pl
+
+nsHTMLTags.h: $(GENTAGS)
+	rm -f nsHTMLTags.h nsHTMLTags.cpp
+	$(PERL) $(GENTAGS) nsHTMLTags