diff --git a/FWCore/Skeletons/python/pkg.py b/FWCore/Skeletons/python/pkg.py
index 5d59cb564215d..e013cf106d4d5 100644
--- a/FWCore/Skeletons/python/pkg.py
+++ b/FWCore/Skeletons/python/pkg.py
@@ -47,7 +47,6 @@ def __init__(self, config=None):
         self.tdir   = self.config.get('tmpl_dir')
         self.author = user_info(self.config.get('author', None))
         self.date   = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
-        self.rcsid  = '$%s$' % 'Id' # CVS commit is too smart
         self.not_in_dir = self.config.get('not_in_dir', [])
         
     def tmpl_etags(self):
@@ -148,7 +147,6 @@ def get_kwds(self):
                  '__date__': self.date,
                  '__class__': self.pname,
                  '__name__': self.pname,
-                 '__rcsid__': self.rcsid,
                  '__subsys__': self.config.get('subsystem', 'Subsystem')}
         args = self.config.get('args', None)
         kwds.update(args)
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EDAnalyzer/EDAnalyzer.cc b/FWCore/Skeletons/scripts/mkTemplates/EDAnalyzer/EDAnalyzer.cc
index a69035c29767b..36f0878ce036a 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EDAnalyzer/EDAnalyzer.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/EDAnalyzer/EDAnalyzer.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.cc __subsys__/__pkgname__/plugins/__class__.cc
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EDFilter/EDFilter.cc b/FWCore/Skeletons/scripts/mkTemplates/EDFilter/EDFilter.cc
index af546cf4623e0..51fcb1aa5d5df 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EDFilter/EDFilter.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/EDFilter/EDFilter.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.cc __subsys__/__pkgname__/plugins/__class__.cc
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EDLooper/EDLooper.cc b/FWCore/Skeletons/scripts/mkTemplates/EDLooper/EDLooper.cc
index e9f7116200951..6976dd0b0a39c 100755
--- a/FWCore/Skeletons/scripts/mkTemplates/EDLooper/EDLooper.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/EDLooper/EDLooper.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.cc __subsys__/__pkgname__/plugins/__class__.cc
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EDProducer/EDProducer.cc b/FWCore/Skeletons/scripts/mkTemplates/EDProducer/EDProducer.cc
index 58c2a0cbd4322..2d6e1128c7653 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EDProducer/EDProducer.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/EDProducer/EDProducer.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.cc __subsys__/__pkgname__/plugins/__class__.cc
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/ESProducer/ESProducer.cc b/FWCore/Skeletons/scripts/mkTemplates/ESProducer/ESProducer.cc
index b4000ea7e9da5..b5b71f86db14e 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/ESProducer/ESProducer.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/ESProducer/ESProducer.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.h __subsys__/__pkgname__/plugins/__class__.cc
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesis.h b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesis.h
index d051e29b248f6..96e3e8e37b503 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesis.h
+++ b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesis.h
@@ -22,7 +22,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 
 #include "DataFormats/PatCandidates/interface/HardEventHypothesis.h"
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesisProducer.h b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesisProducer.h
index c8b6b7d8c32fd..7fa16e26597a6 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesisProducer.h
+++ b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/EventHypothesisProducer.h
@@ -19,7 +19,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/Record/Record.cc b/FWCore/Skeletons/scripts/mkTemplates/Record/Record.cc
index 0cf60f3535f9f..33ae72fd4bf3c 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/Record/Record.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/Record/Record.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:     __pkgname__
+// Package:     __subsys__/__pkgname__
 // Class  :     __class__
 // 
 // Implementation:
@@ -8,7 +8,6 @@
 //
 // Author:      __author__
 // Created:     __date__
-// __rcsid__
 
 #include "__subsys__/__pkgname__/interface/__class__.h"
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
diff --git a/FWCore/Skeletons/scripts/mkTemplates/Record/Record.h b/FWCore/Skeletons/scripts/mkTemplates/Record/Record.h
index 62c1a684a3397..630a06323fdbd 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/Record/Record.h
+++ b/FWCore/Skeletons/scripts/mkTemplates/Record/Record.h
@@ -2,7 +2,7 @@
 #define __class_____class___h
 // -*- C++ -*-
 //
-// Package:     __pkgname__
+// Package:     __subsys__/__pkgname__
 // Class  :     __class__
 // 
 /**\class __class__ __class__.h __subsys__/__pkgname__/interface/__class__.h
@@ -16,7 +16,6 @@
 //
 // Author:      __author__
 // Created:     __date__
-// __rcsid__
 //
 
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
diff --git a/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.cc b/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.cc
index c1134efe055b6..bee527b8323eb 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:     __pkgname__
+// Package:     __subsys__/__pkgname__
 // Class  :     __class__
 // 
 // Implementation:
@@ -8,7 +8,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 
 // system include files
diff --git a/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.h b/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.h
index ad5ba31b2f158..c35a0887e00ee 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.h
+++ b/FWCore/Skeletons/scripts/mkTemplates/Skeleton/Skeleton.h
@@ -2,7 +2,7 @@
 #define __subsys_____pkgname_____class___h
 // -*- C++ -*-
 //
-// Package:     __pkgname__
+// Package:     __subsys__/__pkgname__
 // Class  :     __class__
 // 
 /**\class __class__ __class__.h "__incdir____class__.h"
@@ -16,7 +16,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 
 // system include files
diff --git a/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.cc b/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.cc
index b5cac24d6357b..bff5010fb35ac 100755
--- a/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.cc
+++ b/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /*
@@ -13,7 +13,6 @@
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 
diff --git a/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.h b/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.h
index 70331ffa7707d..e3eec9533e433 100755
--- a/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.h
+++ b/FWCore/Skeletons/scripts/mkTemplates/TSelector/TSelector.h
@@ -2,7 +2,7 @@
 #define __subsys_____pkgname_____class___h
 // -*- C++ -*-
 //
-// Package:    __pkgname__
+// Package:    __subsys__/__pkgname__
 // Class:      __class__
 // 
 /**\class __class__ __class__.h __subsys__/__pkgname__/plugins/__class__.h
@@ -15,7 +15,6 @@ Description: [one line class summary]
 //
 // Original Author:  __author__
 //         Created:  __date__
-// __rcsid__
 //
 //
 #include <TH1.h>