diff --git a/Doc/.gitignore b/Doc/.gitignore
index a551542556338441dd7ec10222012bce6f894a9d..f4775877a050056b933d4f938ea4ff00113589d8 100644
--- a/Doc/.gitignore
+++ b/Doc/.gitignore
@@ -1,2 +1,3 @@
+Makefile
 target
 /targetReference
diff --git a/Doc/Makefile b/Doc/Makefile
deleted file mode 100644
index 9945ca2e15d36cff75600e3fb9f2498b411e9df7..0000000000000000000000000000000000000000
--- a/Doc/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-SCRIPTBASENAME=lectures
-
-include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..ea6f15b43f5bdbc8e671d84dc439504d1b1d583c
--- /dev/null
+++ b/Doc/Makefile.in
@@ -0,0 +1,7 @@
+SCRIPTBASENAME=lectures
+localDbookXslCommonParam=draft.mode=yes
+
+# Update Bulletin board topics
+updateTopics=no 
+
+include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/ws/Docbook/Extensions/Tdata/.gitignore b/ws/Docbook/Extensions/Tdata/.gitignore
index ccca91f9e132249e2c88731f3ed20538a0d8b98b..220f7efaf73971589e41c6af439e698ccada79cf 100644
--- a/ws/Docbook/Extensions/Tdata/.gitignore
+++ b/ws/Docbook/Extensions/Tdata/.gitignore
@@ -1,4 +1,5 @@
 xsltest
+Makefile
 /qanda.gen.xml
 *~
 /bibGloss.trans.xml
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile.in
similarity index 70%
rename from ws/Docbook/Extensions/Tdata/Makefile
rename to ws/Docbook/Extensions/Tdata/Makefile.in
index feb8bff2eda968b45ffd94515785c5f2f183e528..dfd0cd4cbc0bb3a0e597c7f3a132fc7ae50ca78c 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile.in
@@ -1,4 +1,7 @@
 SCRIPTBASENAME=fig
 localDbookXslCommonParam=draft.mode=yes
 
+# Update Bulletin board topics
+updateTopics=no 
+
 include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index a12e816594efe2139baa2aa9c112a96a511cedac..7a92c5b4e6e80ef34814ddc3922e965fabb8f66a 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -86,7 +86,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
             -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl >  ${*}.xml
 	${SAXONCMD} -s:$*.xml \
            -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2topics.xsl ${dbookXslWebhelpParam} > ${@D}/topics.xml
-	${CMDID2TOPIC}  ${@D}/topics # Only basename without .xml extension
+	if [ $(updateTopics) = 'yes' ]; then ${CMDID2TOPIC}  ${@D}/topicsi;fi # Only basename without .xml extension
 	${SAXONCMD} -s:$*.xml \
            -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
 	${SAXONCMD} -s:$*.xml \