diff --git a/BLFS/Makefile b/BLFS/Makefile
index d89d6da..47361c8 100644
--- a/BLFS/Makefile
+++ b/BLFS/Makefile
@@ -3,8 +3,6 @@
 # Additional changes: George Boudreau <georgeb@linuxfromscratch.org>
 #                     Pierre Labastie <pierre.labastie at neuf.fr>
 
-# $Id$
-
 ifdef V
   Q =
 else
diff --git a/BLFS/TODO b/BLFS/TODO
index 2b7238d..51207ec 100644
--- a/BLFS/TODO
+++ b/BLFS/TODO
@@ -2,7 +2,6 @@
 #
 # Project TODO list
 #
-# $Id$
 #####
 
 
diff --git a/BLFS/envars.conf b/BLFS/envars.conf
index ec87324..29fe008 100644
--- a/BLFS/envars.conf
+++ b/BLFS/envars.conf
@@ -2,8 +2,6 @@
 #
 # Configuration file for the BLFS module
 #
-# $Id$
-#
 # Set default envars used in the build scripts
 #
 #####
diff --git a/BLFS/gen-makefile.sh b/BLFS/gen-makefile.sh
index bf3f6c0..583f051 100755
--- a/BLFS/gen-makefile.sh
+++ b/BLFS/gen-makefile.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 #
-# $Id$
-#
 set -e
 
 declare TOPDIR='..'
diff --git a/BLFS/gen-special.sh b/BLFS/gen-special.sh
index 2cf2e21..adaac4c 100755
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 #-------------------------------------------------------------------------
 # generates an xsl stylesheet containing a template for special
 # cases in the book:
diff --git a/BLFS/gen_pkg_book.sh b/BLFS/gen_pkg_book.sh
index cbc7033..ed1b55b 100755
--- a/BLFS/gen_pkg_book.sh
+++ b/BLFS/gen_pkg_book.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 #
-# $Id$
-#
 #  Read and parse the configuration parameters..
 #
 set -e
diff --git a/BLFS/libs/constants.inc b/BLFS/libs/constants.inc
index 9308a7c..08fd193 100644
--- a/BLFS/libs/constants.inc
+++ b/BLFS/libs/constants.inc
@@ -2,7 +2,6 @@
 #
 # common constants
 #
-# $Id$
 #####
 
 
diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies
index 21591f2..bc78cf4 100644
--- a/BLFS/libs/func_dependencies
+++ b/BLFS/libs/func_dependencies
@@ -1,7 +1,5 @@
 #!/bin/bash
 #
-# $Id$
-#
 
 #-----------------------------------------------------------------------------#
 # This is a set of (recursive) functions for manipulating a dependency graph. #
diff --git a/BLFS/packdesc.dtd b/BLFS/packdesc.dtd
index 1be6db9..24ae2c2 100644
--- a/BLFS/packdesc.dtd
+++ b/BLFS/packdesc.dtd
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 <!-- Top level element -->
 <!ELEMENT princList (list+)>
 <!-- list corresponds to parts of the book -->
diff --git a/BLFS/update-lfs.sh b/BLFS/update-lfs.sh
index 5bc64c6..755247b 100755
--- a/BLFS/update-lfs.sh
+++ b/BLFS/update-lfs.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#    $Id$
-
 # Fills the tracking file with versions of LFS packages taken from an
 # SVN repository, at either a given date or a given tag (argument $1).
 #------
diff --git a/BLFS/xsl/bump.xsl b/BLFS/xsl/bump.xsl
index 791eb15..c555069 100644
--- a/BLFS/xsl/bump.xsl
+++ b/BLFS/xsl/bump.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
diff --git a/BLFS/xsl/dependencies.xsl b/BLFS/xsl/dependencies.xsl
index 178ff1a..083fbb1 100644
--- a/BLFS/xsl/dependencies.xsl
+++ b/BLFS/xsl/dependencies.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index 2782f84..d301903 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl
index b8a1137..b069245 100644
--- a/BLFS/xsl/gen_pkg_list.xsl
+++ b/BLFS/xsl/gen_pkg_list.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
 <!-- Takes the blfs-full.xml file and extract a list
      of packages obeying packdesc.dtd + looks for already
      installed packages in the tracking file (stringparam
diff --git a/BLFS/xsl/lfs_make_book.xsl b/BLFS/xsl/lfs_make_book.xsl
index 8de370f..049aef2 100644
--- a/BLFS/xsl/lfs_make_book.xsl
+++ b/BLFS/xsl/lfs_make_book.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
diff --git a/BLFS/xsl/make_book.xsl b/BLFS/xsl/make_book.xsl
index f08d44e..e6f62a0 100644
--- a/BLFS/xsl/make_book.xsl
+++ b/BLFS/xsl/make_book.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
diff --git a/BLFS/xsl/process-install.xsl b/BLFS/xsl/process-install.xsl
index f2dac67..2308c1b 100644
--- a/BLFS/xsl/process-install.xsl
+++ b/BLFS/xsl/process-install.xsl
@@ -21,8 +21,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
-<!-- $Id$ -->
-
   <xsl:template name="process-install">
     <xsl:param name="instruction-tree"/>
     <xsl:param name="want-stats"/>
diff --git a/BLFS/xsl/process-replaceable.xsl b/BLFS/xsl/process-replaceable.xsl
index adb8405..e3e2331 100644
--- a/BLFS/xsl/process-replaceable.xsl
+++ b/BLFS/xsl/process-replaceable.xsl
@@ -3,8 +3,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
-<!-- $Id$ -->
-
 <!--===================================================================-->
   <!-- Localization in the form ll_CC.charmap@modifier (to be used in
        bash shell startup scripts). ll, CC, and charmap must be present:
diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl
index 5147aae..6d92d2e 100644
--- a/BLFS/xsl/scripts.xsl
+++ b/BLFS/xsl/scripts.xsl
@@ -5,8 +5,6 @@
     extension-element-prefixes="exsl"
     version="1.0">
 
-<!-- $Id$ -->
-
 <!-- XSLT stylesheet to create shell scripts from "linear build" BLFS books. -->
 
 <!-- parameters and global variables -->
diff --git a/CHEATSHEET b/CHEATSHEET
index 46ea5f5..dc681d3 100644
--- a/CHEATSHEET
+++ b/CHEATSHEET
@@ -1,4 +1,3 @@
-$Id$
 This file contains examples of menu settings for various tasks.
 ------------------------------
 LFS book, System V, stable (8.2) version.
diff --git a/CLFS/clfs.xsl b/CLFS/clfs.xsl
index df1fe5d..fa43014 100644
--- a/CLFS/clfs.xsl
+++ b/CLFS/clfs.xsl
@@ -4,8 +4,6 @@
   %general-entities;
 ]>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
diff --git a/CLFS/master.sh b/CLFS/master.sh
index e14bf25..5914ae1 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-
 
 orphan_scripts="" # 2 scripts do not fit BOOT_Makefiles LUSER environment
 
diff --git a/CLFS2/clfs2.xsl b/CLFS2/clfs2.xsl
index c809c9c..4f54f86 100644
--- a/CLFS2/clfs2.xsl
+++ b/CLFS2/clfs2.xsl
@@ -4,8 +4,6 @@
   %general-entities;
 ]>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
     extension-element-prefixes="exsl"
diff --git a/CLFS2/master.sh b/CLFS2/master.sh
index 96d5eda..32cb018 100644
--- a/CLFS2/master.sh
+++ b/CLFS2/master.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 ###################################
 ###          FUNCTIONS          ###
diff --git a/CLFS3/clfs3.xsl b/CLFS3/clfs3.xsl
index 199f62f..04381f5 100644
--- a/CLFS3/clfs3.xsl
+++ b/CLFS3/clfs3.xsl
@@ -4,8 +4,6 @@
   %general-entities;
 ]>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
     extension-element-prefixes="exsl"
diff --git a/CLFS3/master.sh b/CLFS3/master.sh
index 30ee0ff..d7851a0 100644
--- a/CLFS3/master.sh
+++ b/CLFS3/master.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 ###################################
 ###          FUNCTIONS          ###
diff --git a/Config.in b/Config.in
index f93b48d..ef68859 100644
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,3 @@
-# $Id$
 menu "BOOK Settings"
 
     #--- BOOK/script
diff --git a/FUNCTION_LIST b/FUNCTION_LIST
index cc961b7..6c9cb6e 100644
--- a/FUNCTION_LIST
+++ b/FUNCTION_LIST
@@ -1,5 +1,3 @@
-$Id$
-
 This is the list of functions used in jhalfs, excluding BLFS tool functions
 and functions defined in {C,H}LFS/master.sh.
 I felt the need for documenting it when trying to add package management.
diff --git a/HLFS/hlfs.xsl b/HLFS/hlfs.xsl
index 36c8809..699ee62 100644
--- a/HLFS/hlfs.xsl
+++ b/HLFS/hlfs.xsl
@@ -4,8 +4,6 @@
   %general-entities;
 ]>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:exsl="http://exslt.org/common"
     extension-element-prefixes="exsl"
diff --git a/HLFS/master.sh b/HLFS/master.sh
index 21d3b74..9ae8f45 100644
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 set -e  # Enable error trapping
 
-# $Id$
-
 ###################################
 ###          FUNCTIONS          ###
 ###################################
diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index aa4c847..72dbe59 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:exsl="http://exslt.org/common"
diff --git a/LFS/master.sh b/LFS/master.sh
index e1232a6..e382af5 100644
--- a/LFS/master.sh
+++ b/LFS/master.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 ###################################
 ###	    FUNCTIONS		###
 ###################################
diff --git a/Makefile b/Makefile
index 55653df..bdd1fde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# $Id$
 # From the Build Scripts Written By: Jim Gifford <lfs@jg555.com>
 # Modified By: Joe Ciccone <jciccone@linuxfromscratch.org
 # Additional changes: George Boudreau <georgeb@linuxfromscratch.org>
diff --git a/README b/README
index f5fccf6..f8deb3c 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-$Id$
-
 1. INTRODUCTION::
 
      The scripts in this directory implement an automation of the building
diff --git a/README.BLFS b/README.BLFS
index 4bf8f74..d1c9ccd 100644
--- a/README.BLFS
+++ b/README.BLFS
@@ -1,5 +1,3 @@
-$Id$
-
 1. INTRODUCTION::
 
      To automate package builds from the BLFS book instructions is a huge
diff --git a/README.CLFS b/README.CLFS
index e4251a2..f633293 100644
--- a/README.CLFS
+++ b/README.CLFS
@@ -1,5 +1,3 @@
-# $Id$
-
        CLFS-1.x NOTES
 
   None for now.
diff --git a/README.CUSTOM b/README.CUSTOM
index 76192cb..c3936fd 100644
--- a/README.CUSTOM
+++ b/README.CUSTOM
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 	HOW TO ADD CUSTOM SCRIPTS TO THE JHALFS MAKEFILE
 
 
diff --git a/README.HLFS b/README.HLFS
index 102e83f..a5488b9 100644
--- a/README.HLFS
+++ b/README.HLFS
@@ -1,6 +1,3 @@
-$Id$
-
-
 		::::NOTICE::::
 HLFS has not be updated for a very long time. Since then, jhalfs has evolved
 and is now incompatible with HLFS.
diff --git a/README.PACKAGE_MANAGEMENT b/README.PACKAGE_MANAGEMENT
index bad7409..f0dd573 100644
--- a/README.PACKAGE_MANAGEMENT
+++ b/README.PACKAGE_MANAGEMENT
@@ -1,6 +1,5 @@
 TITLE : Package management in jhalfs
 BY    : Pierre Labastie (work in progress)
-$Id$
 
 1. INTRODUCTION:
 
diff --git a/TODO b/TODO
index d608e59..33bd042 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
             jhalfs TODO
           ---------------
-$Id$
 
 MASTER SCRIPT
 -------------
diff --git a/common/chroot.xsl b/common/chroot.xsl
index d5aa46e..75371c0 100644
--- a/common/chroot.xsl
+++ b/common/chroot.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:exsl="http://exslt.org/common"
diff --git a/common/common-functions b/common/common-functions
index 85ca022..3893511 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 set -e
 
 
diff --git a/common/create-sbu_du-report.sh b/common/create-sbu_du-report.sh
index 3224d74..460e4aa 100755
--- a/common/create-sbu_du-report.sh
+++ b/common/create-sbu_du-report.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-#$Id$
 
 set -e
 
diff --git a/common/hostreqs.xsl b/common/hostreqs.xsl
index a9eeeab..0f1f842 100644
--- a/common/hostreqs.xsl
+++ b/common/hostreqs.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id$ -->
 <!-- Extracts minimal versions from LFS book host requirements,
      and generates a script containing statements of the
      form MIN_prog_VERSION=xx.yy.zz.
diff --git a/common/kernfs.xsl b/common/kernfs.xsl
index 8500a75..2f875de 100644
--- a/common/kernfs.xsl
+++ b/common/kernfs.xsl
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!-- $Id: kernfs.xsl 3776 2014-01-12 21:43:04Z pierre $ -->
-
 <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       version="1.0">
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index 4cd6aff..cd9c41a 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 #----------------------------#
 get_book() {                 #
 #----------------------------#
diff --git a/common/libs/func_check_version.sh b/common/libs/func_check_version.sh
index 73e12b4..fc7d79a 100644
--- a/common/libs/func_check_version.sh
+++ b/common/libs/func_check_version.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 check_version() {
 : <<inline_doc
       Tests for a minimum version level. Compares to version numbers and forces an
diff --git a/common/libs/func_compare.sh b/common/libs/func_compare.sh
index f967fbf..08bcda6 100644
--- a/common/libs/func_compare.sh
+++ b/common/libs/func_compare.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 #----------------------------------#
 wrt_compare_targets() {            #
 #----------------------------------#
diff --git a/common/libs/func_custom_pkgs b/common/libs/func_custom_pkgs
index b671446..7f7a630 100644
--- a/common/libs/func_custom_pkgs
+++ b/common/libs/func_custom_pkgs
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 #----------------------------------#
 wrt_CustomTools_target() {         # Add any users supplied scripts
 #----------------------------------#
diff --git a/common/libs/func_download_pkgs b/common/libs/func_download_pkgs
index 3cd5707..69a6e78 100644
--- a/common/libs/func_download_pkgs
+++ b/common/libs/func_download_pkgs
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
-
 #----------------------------#
 get_sources() {              # Download file, write name to MISSING_FILES.DMP if an error
 #----------------------------#
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 5fafc99..092c4f8 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 #----------------------------# Prepare BLFS_ROOT and extract
 install_blfs_tools() {       # the scriptlets to build
 #----------------------------# the dependency tools
diff --git a/common/libs/func_save.sh b/common/libs/func_save.sh
index 5d56318..7b80c87 100644
--- a/common/libs/func_save.sh
+++ b/common/libs/func_save.sh
@@ -1,5 +1,3 @@
-# $Id: func_compare.sh 3824 2015-03-07 22:05:24Z pierre $
-
 #----------------------------------#
 wrt_save_target() {            #
 #----------------------------------#
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index 7560bc0..86419bf 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 declare -r dotSTR=".................."
 
 
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 052ec58..6799c18 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 #=== MAKEFILE HEADER ===
 
 #----------------------------------#
diff --git a/common/makefile-functions b/common/makefile-functions
index 8126986..819fbf8 100644
--- a/common/makefile-functions
+++ b/common/makefile-functions
@@ -1,6 +1,3 @@
-
-# $Id$
-
 BOLD    = ""
 RED     = ""
 GREEN   = ""
diff --git a/common/packages.xsl b/common/packages.xsl
index 48a96f5..1cab2e0 100644
--- a/common/packages.xsl
+++ b/common/packages.xsl
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
diff --git a/common/progress_bar.sh b/common/progress_bar.sh
index 606fda5..6afb0a3 100644
--- a/common/progress_bar.sh
+++ b/common/progress_bar.sh
@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-# $Id$
 
 set -e
 
diff --git a/common/urls.xsl b/common/urls.xsl
index c2a5e66..2e028b8 100644
--- a/common/urls.xsl
+++ b/common/urls.xsl
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
 
-<!-- $Id$ -->
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     version="1.0">
 
diff --git a/custom/examples/940-libffi b/custom/examples/940-libffi
index d1a23cc..62821a8 100644
--- a/custom/examples/940-libffi
+++ b/custom/examples/940-libffi
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="libffi"
 PKG_VERSION="3.2.1"
 PKG_FILE="libffi-3.2.1.tar.gz"
diff --git a/custom/examples/941-pcre b/custom/examples/941-pcre
index c6c7d2c..a37c2f1 100644
--- a/custom/examples/941-pcre
+++ b/custom/examples/941-pcre
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="pcre"
 PKG_VERSION="8.37"
 PKG_FILE="pcre-8.37.tar.bz2"
diff --git a/custom/examples/945-python3 b/custom/examples/945-python3
index ba74a69..67b9889 100644
--- a/custom/examples/945-python3
+++ b/custom/examples/945-python3
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="python3"
 PKG_VERSION="3.4.3"
 PKG_FILE="Python-3.4.3.tar.xz"
diff --git a/custom/examples/951-glib b/custom/examples/951-glib
index 9668e7c..58c6279 100644
--- a/custom/examples/951-glib
+++ b/custom/examples/951-glib
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="glib"
 PKG_VERSION="2.44.1"
 PKG_FILE="glib-2.44.1.tar.xz"
diff --git a/custom/examples/952-mc b/custom/examples/952-mc
index d2dc906..f9132b7 100644
--- a/custom/examples/952-mc
+++ b/custom/examples/952-mc
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="mc"
 PKG_VERSION="4.8.14"
 PKG_FILE="mc-4.8.14.tar.xz"
diff --git a/custom/examples/960-pppd b/custom/examples/960-pppd
index be5b3e3..dd00caf 100644
--- a/custom/examples/960-pppd
+++ b/custom/examples/960-pppd
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # The PPP package contains the pppd daemon and the chat program.
 # This is used for connecting to other machines; often for connecting
 # to the Internet via a dial-up or PPPoE connection to an ISP.
diff --git a/custom/examples/961-openssl b/custom/examples/961-openssl
index 1bd5e09..0ffe42a 100644
--- a/custom/examples/961-openssl
+++ b/custom/examples/961-openssl
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # The OpenSSL package contains management tools and libraries
 # relating to cryptography. These are useful for providing
 # cryptography functions to other packages, notably OpenSSH,
diff --git a/custom/examples/963-gpm b/custom/examples/963-gpm
index fb48e12..b5cdcea 100644
--- a/custom/examples/963-gpm
+++ b/custom/examples/963-gpm
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="gpm"
 PKG_VERSION="1.20.7"
 PKG_FILE="gpm-${PKG_VERSION}.tar.bz2"
diff --git a/custom/examples/963-lynx b/custom/examples/963-lynx
index 78c1fe9..8f50e13 100644
--- a/custom/examples/963-lynx
+++ b/custom/examples/963-lynx
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # Lynx is a text based web browser.
 #
 
diff --git a/custom/examples/964-dhcpcd b/custom/examples/964-dhcpcd
index 125cf54..4377a5f 100644
--- a/custom/examples/964-dhcpcd
+++ b/custom/examples/964-dhcpcd
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # dhcpcd is an implementation of the DHCP client specified in RFC2131.
 # This is useful for connecting your computer to a network which uses
 # DHCP to assign network addresses.
diff --git a/custom/examples/997-nasm b/custom/examples/997-nasm
index 261d561..50fa2c6 100644
--- a/custom/examples/997-nasm
+++ b/custom/examples/997-nasm
@@ -1,5 +1,3 @@
-#
-# $Id$
 # NASM (Netwide Assembler) is an 80x86 assembler designed
 # for portability and modularity. It includes a
 # disassembler as well.
diff --git a/custom/examples/998-syslinux b/custom/examples/998-syslinux
index 03d6470..59466a2 100644
--- a/custom/examples/998-syslinux
+++ b/custom/examples/998-syslinux
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # SYSLINUX is a collection of boot loaders for the Linux
 # operating system which operates off Linux ext2/3
 # filesystems, MS-DOS FAT filesystems, network servers
diff --git a/custom/examples/999-blfs_bootscripts b/custom/examples/999-blfs_bootscripts
index 2f02ee5..97267ee 100644
--- a/custom/examples/999-blfs_bootscripts
+++ b/custom/examples/999-blfs_bootscripts
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 PKG="blfs-bootscripts"
 PKG_VERSION="20150924"
 PKG_FILE="blfs-bootscripts-${PKG_VERSION}.tar.bz2"
diff --git a/custom/examples_CLFS-E/950-dropbear b/custom/examples_CLFS-E/950-dropbear
index bd98ae0..8d5769b 100644
--- a/custom/examples_CLFS-E/950-dropbear
+++ b/custom/examples_CLFS-E/950-dropbear
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # Code taken from CLFS-Embedded
 # Chapter 12 Beyond CLFS Embedded
 #
diff --git a/custom/examples_CLFS-E/960-iptables b/custom/examples_CLFS-E/960-iptables
index f3e965f..0371b33 100644
--- a/custom/examples_CLFS-E/960-iptables
+++ b/custom/examples_CLFS-E/960-iptables
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # Code taken from CLFS-Embedded
 # Chapter 12 Beyond CLFS Embedded
 #
diff --git a/custom/template b/custom/template
index 37687f6..ae011bc 100644
--- a/custom/template
+++ b/custom/template
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
 # Any comments you wish to add
 #
 
diff --git a/extras/do_copy_files b/extras/do_copy_files
index a176d7b..a9efbb1 100755
--- a/extras/do_copy_files
+++ b/extras/do_copy_files
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id$
+
 set -e
 
 : <<inline_doc
diff --git a/extras/do_ica_prep b/extras/do_ica_prep
index 37d76f8..a842a04 100755
--- a/extras/do_ica_prep
+++ b/extras/do_ica_prep
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 # Acknowledgment:
 #  The following code is a modified version of an original work written by
diff --git a/extras/do_ica_work b/extras/do_ica_work
index fde1fd1..5789b12 100755
--- a/extras/do_ica_work
+++ b/extras/do_ica_work
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 # Acknowledgment:
 #  The following code is a modified version of an original work written by
diff --git a/install-blfs-tools.sh b/install-blfs-tools.sh
index 0235bb1..0696262 100755
--- a/install-blfs-tools.sh
+++ b/install-blfs-tools.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id$
+
 set -e
 
 : << inline_doc
diff --git a/optimize/opt_config b/optimize/opt_config
index e9603c4..5a436a1 100644
--- a/optimize/opt_config
+++ b/optimize/opt_config
@@ -3,9 +3,6 @@
 # optimization configuration file
 #
 #####
-#
-#$Id$
-#
 
 #--- List of packages that have issues with parallelization.
 ## As of December 21st, 2019, there seems to be none...
diff --git a/optimize/opt_config.d/O2pipe b/optimize/opt_config.d/O2pipe
index 5ef3784..27a8d97 100644
--- a/optimize/opt_config.d/O2pipe
+++ b/optimize/opt_config.d/O2pipe
@@ -1,5 +1,3 @@
-#
-#$Id$
 # Pierre Labastie from O3pipe: 12/20/2011
 #####
 #
diff --git a/optimize/opt_config.d/O3pipe b/optimize/opt_config.d/O3pipe
index 517f39f..f2abfc8 100644
--- a/optimize/opt_config.d/O3pipe
+++ b/optimize/opt_config.d/O3pipe
@@ -1,6 +1,3 @@
-#
-#$Id$
-#
 #####
 #
 # MODE O3pipe configuration
diff --git a/optimize/opt_config.d/O3pipe_march b/optimize/opt_config.d/O3pipe_march
index 3e2728e..df19bbe 100644
--- a/optimize/opt_config.d/O3pipe_march
+++ b/optimize/opt_config.d/O3pipe_march
@@ -1,6 +1,3 @@
-#
-#$Id$
-#
 #####
 #
 # MODE O3pipe_march configuration
diff --git a/optimize/opt_config.d/defOpt_fPIC b/optimize/opt_config.d/defOpt_fPIC
index f114ab8..1ecb1eb 100644
--- a/optimize/opt_config.d/defOpt_fPIC
+++ b/optimize/opt_config.d/defOpt_fPIC
@@ -1,6 +1,3 @@
-#
-#$Id$
-#
 #####
 #
 # MODE defOpt_fPIC configuration
diff --git a/optimize/opt_config.d/noOpt b/optimize/opt_config.d/noOpt
index 168d46f..04d81e9 100644
--- a/optimize/opt_config.d/noOpt
+++ b/optimize/opt_config.d/noOpt
@@ -1,6 +1,3 @@
-#
-#$Id$
-#
 #####
 #
 # MODE noOpt configuration
diff --git a/optimize/opt_config.d/noSymbols b/optimize/opt_config.d/noSymbols
index 7089f02..12115e8 100644
--- a/optimize/opt_config.d/noSymbols
+++ b/optimize/opt_config.d/noSymbols
@@ -1,6 +1,3 @@
-#
-#$Id$
-#
 #####
 #
 # MODE noOpt_noSymbols configuration
diff --git a/optimize/optimize_functions b/optimize/optimize_functions
index 22ccde1..5960241 100644
--- a/optimize/optimize_functions
+++ b/optimize/optimize_functions
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 set +e
 
 
diff --git a/pkgmngt/packInstall.sh.dpkg b/pkgmngt/packInstall.sh.dpkg
index 02d3b74..4cc73d2 100644
--- a/pkgmngt/packInstall.sh.dpkg
+++ b/pkgmngt/packInstall.sh.dpkg
@@ -1,4 +1,3 @@
-# $Id$
 # function for packing and installing a tree. We only have access
 # to variables PKGDIR and PKG_DEST
 
diff --git a/pkgmngt/packInstall.sh.pacman b/pkgmngt/packInstall.sh.pacman
index 00d036c..4397645 100644
--- a/pkgmngt/packInstall.sh.pacman
+++ b/pkgmngt/packInstall.sh.pacman
@@ -1,4 +1,3 @@
-# $Id$
 # function for packing and installing a tree. We only have access
 # to variables PKGDIR and PKG_DEST
 # Other variables can be passed on the command line, or in the environment
diff --git a/pkgmngt/packInstall.sh.porg b/pkgmngt/packInstall.sh.porg
index 9094d8f..100e569 100644
--- a/pkgmngt/packInstall.sh.porg
+++ b/pkgmngt/packInstall.sh.porg
@@ -1,4 +1,3 @@
-# $Id$
 # functions for recording installation of a package and make a tarball,
 # or using fakeroot type commands for install, then packing and installing
 # the package.
diff --git a/pkgmngt/packInstall.sh.template b/pkgmngt/packInstall.sh.template
index 16f8941..ecde84d 100644
--- a/pkgmngt/packInstall.sh.template
+++ b/pkgmngt/packInstall.sh.template
@@ -1,4 +1,3 @@
-# $Id$
 # function for packing and installing a tree. We only have access
 # to variables PKGDIR and PKG_DEST
 # Other variables can be passed on the command line, or in the environment
diff --git a/pkgmngt/packageManager.xml.dpkg b/pkgmngt/packageManager.xml.dpkg
index 48f4a7a..4c6f544 100644
--- a/pkgmngt/packageManager.xml.dpkg
+++ b/pkgmngt/packageManager.xml.dpkg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
+
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY buildtime "Approximate build time">
diff --git a/pkgmngt/packageManager.xml.pacman b/pkgmngt/packageManager.xml.pacman
index aa4e9ce..d4c6af9 100644
--- a/pkgmngt/packageManager.xml.pacman
+++ b/pkgmngt/packageManager.xml.pacman
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--  Above is a mandatory header for xml files. It must be the first
 line in the file. Change encoding to the one you use on your computer -->
-<!-- $Id$ -->
+
 <!-- Mandatory DOCTYPE declaration. Fill free to add entities,
 but no external entities in local files, since they would not
 be accessible from JHALFSDIR. Change the document type `article' to
diff --git a/pkgmngt/packageManager.xml.template b/pkgmngt/packageManager.xml.template
index 0375d90..d72509b 100644
--- a/pkgmngt/packageManager.xml.template
+++ b/pkgmngt/packageManager.xml.template
@@ -1,4 +1,3 @@
-<!-- $Id$ -->
 <!-- Mandatory header for xml files  change encoding to the one
 you use on your computer -->
 <?xml version="1.0" encoding="UTF-8"?>