diff --git a/resources/cimg_buildpackage b/resources/cimg_buildpackage
index a9ac6f8d4573fee46f82489355202b828ec0521b..65d3c3d628f4dd4559ea295d16060dc1e35deac6 100755
--- a/resources/cimg_buildpackage
+++ b/resources/cimg_buildpackage
@@ -48,7 +48,8 @@ RELEASE0=`grep "#define cimg_version" CImg/CImg.h | tail -c 4`
 RELEASE1=`echo $RELEASE0 | head -c 1`
 RELEASE2=`echo $RELEASE0 | head -c 2 | tail -c 1`
 RELEASE3=`echo $RELEASE0 | head -c 3 | tail -c 1`
-RELEASE=$RELEASE1.$RELEASE2.$RELEASE3
+VERSION=${RELEASE1}${RELEASE2}${RELEASE3}
+SVERSION=${RELEASE1}.${RELEASE2}.${RELEASE3}
 
 # Read command line options.
 if [ "$1" == "final" ]; then SUFFIX=""; SSUFFIX=""; else SUFFIX=_pre`date +%m%d%y`; SSUFFIX=_pre; fi
@@ -56,13 +57,13 @@ if [ "$1" == "final" ]; then SUFFIX=""; SSUFFIX=""; else SUFFIX=_pre`date +%m%d%
 # Define the different paths and filenames used in this script.
 BASE_DIR=`pwd`
 SRC_DIR=${BASE_DIR}/CImg
-DEST_DIR=/tmp/CImg-${RELEASE}${SUFFIX}
-ZIP_FILE=CImg_${RELEASE}${SSUFFIX}.zip
+DEST_DIR=/tmp/CImg-${SVERSION}${SUFFIX}
+ZIP_FILE=CImg_${SVERSION}${SSUFFIX}.zip
 LOG_FILE=${BASE_DIR}/LOG_`basename $ZIP_FILE .zip`.txt
 rm -rf $LOG_FILE
 
 echo
-echo " - Release number : $RELEASE$SUFFIX"
+echo " - Release number : $SVERSION$SUFFIX"
 echo " - Base directory : $BASE_DIR/"
 echo " - Source directory : $SRC_DIR/"
 echo " - Build directory : $DEST_DIR/"
@@ -75,7 +76,7 @@ rm -rf $DEST_DIR
 mkdir $DEST_DIR
 cd $SRC_DIR
 cp -f CImg.h Licence_CeCILL-C_V1-en.txt Licence_CeCILL_V2-en.txt $DEST_DIR
-sed s\/_cimg_version\/$RELEASE$SUFFIX\/ README.txt > $DEST_DIR/README.txt
+sed s\/_cimg_version\/$SVERSION$SUFFIX\/ README.txt > $DEST_DIR/README.txt
 
 mkdir $DEST_DIR/examples
 cd $SRC_DIR/examples
@@ -117,8 +118,15 @@ for i in `find . -name "rules"`; do chmod a+x $i; done
 # Generate Documentation with doxygen
 echo " - Generate reference documentation using Doxygen."
 cd $SRC_DIR/html
+
+if [ "$1" == "final" ]; then
+    gmic _update_header_html header.html,${VERSION},0
+else
+    gmic _update_header_html header.html,${VERSION},1
+fi
+
 echo -e "\n** Log generated by 'doxygen' **\n\n">>$LOG_FILE
-( cat CImg.doxygen ; echo "PROJECT_NUMBER=$RELEASE$SUFFIX" ) | doxygen - >>$LOG_FILE 2>&1
+( cat CImg.doxygen ; echo "PROJECT_NUMBER=$SVERSION$SUFFIX" ) | doxygen - >>$LOG_FILE 2>&1
 
 echo " - Build reference documentation in PDF format."
 cd $SRC_DIR/html/latex
@@ -132,11 +140,11 @@ rm -rf ../latex
 echo " - Commit on GIT repository."
 cd $SRC_DIR
 if [ "$1" == "final" ]; then
-    git tag -d v.$RELEASE1.$RELEASE2.$RELEASE3
-    git tag v.$RELEASE1.$RELEASE2.$RELEASE3
-    git commit -m "Final release "${RELEASE} >>$LOG_FILE 2>&1
+    git tag -d v.$SVERSION
+    git tag v.$SVERSION
+    git commit -m "Final release "${SVERSION} >>$LOG_FILE 2>&1
 else
-    git commit -m "Auto-commit for release "${RELEASE}${SUFFIX} >>$LOG_FILE 2>&1
+    git commit -m "Auto-commit for release "${SVERSION}${SUFFIX} >>$LOG_FILE 2>&1
 fi
 git push --tags