diff --git a/Makefile.am b/Makefile.am
index d42668a..5d9cce1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/autogen.des b/autogen.des
index 3571d45..c5daac8 100755
--- a/autogen.des
+++ b/autogen.des
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $OpenPAM$
 #
 
 set -ex
diff --git a/autogen.sh b/autogen.sh
index 56fb3ed..f6399fb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $OpenPAM$
 #
 
 libtoolize --copy --force
diff --git a/bin/Makefile.am b/bin/Makefile.am
index ebff7de..8926467 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 SUBDIRS = openpam_dump_policy
 
diff --git a/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am
index cb43bc2..607d156 100644
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/bin/openpam_dump_policy/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
diff --git a/bin/openpam_dump_policy/openpam_dump_policy.c b/bin/openpam_dump_policy/openpam_dump_policy.c
index e2338c8..8d51895 100644
--- a/bin/openpam_dump_policy/openpam_dump_policy.c
+++ b/bin/openpam_dump_policy/openpam_dump_policy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am
index 8a862f6..951bb17 100644
--- a/bin/pamtest/Makefile.am
+++ b/bin/pamtest/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
diff --git a/bin/pamtest/pamtest.1 b/bin/pamtest/pamtest.1
index 9a5f69f..156bdd4 100644
--- a/bin/pamtest/pamtest.1
+++ b/bin/pamtest/pamtest.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Dd July 11, 2013
 .Dt PAMTEST 1
diff --git a/bin/pamtest/pamtest.c b/bin/pamtest/pamtest.c
index 6bb2d5c..68c161b 100644
--- a/bin/pamtest/pamtest.c
+++ b/bin/pamtest/pamtest.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bin/su/Makefile.am b/bin/su/Makefile.am
index 8770091..8ae1d43 100644
--- a/bin/su/Makefile.am
+++ b/bin/su/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
diff --git a/bin/su/su.1 b/bin/su/su.1
index cc6cb23..bd64572 100644
--- a/bin/su/su.1
+++ b/bin/su/su.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Dd November 2, 2011
 .Dt SU 1
diff --git a/bin/su/su.c b/bin/su/su.c
index 204b07e..914cc33 100644
--- a/bin/su/su.c
+++ b/bin/su/su.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/configure.ac b/configure.ac
index 0e2b77e..aef90c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
-dnl $Id$
+dnl $OpenPAM$
 
 AC_PREREQ([2.62])
-AC_REVISION([$Id$])
+AC_REVISION([$OpenPAM$])
 AC_INIT([OpenPAM], [trunk], [des@des.no], [openpam], [http://www.openpam.org/])
 AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index de912b9..a63ad4d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
-# $Id$
+# $OpenPAM$
 
 SUBDIRS = man
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 4ec276a..18c9f82 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 NULL =
 
diff --git a/doc/man/openpam.man b/doc/man/openpam.man
index 7e411a2..2493c35 100644
--- a/doc/man/openpam.man
+++ b/doc/man/openpam.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Sh DESCRIPTION
 These functions are OpenPAM extensions to the PAM API.
diff --git a/doc/man/pam.conf.5 b/doc/man/pam.conf.5
index a24ff4d..0565817 100644
--- a/doc/man/pam.conf.5
+++ b/doc/man/pam.conf.5
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Dd March 17, 2013
 .Dt PAM.CONF 5
diff --git a/doc/man/pam.man b/doc/man/pam.man
index acd1f0f..08eae62 100644
--- a/doc/man/pam.man
+++ b/doc/man/pam.man
@@ -1,5 +1,5 @@
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number
diff --git a/doc/man/pam_conv.3 b/doc/man/pam_conv.3
index 6018555..79b1b55 100644
--- a/doc/man/pam_conv.3
+++ b/doc/man/pam_conv.3
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $OpenPAM$
 .\"
 .Dd June 16, 2005
 .Dt PAM_CONV 3
diff --git a/doc/xsso_errata.txt b/doc/xsso_errata.txt
index 47acda7..6c194bc 100644
--- a/doc/xsso_errata.txt
+++ b/doc/xsso_errata.txt
@@ -1,4 +1,4 @@
-$Id$
+$OpenPAM$
 
 Errata in XSSO, chapter 5:
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 4a3c658..e0406b9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
-# $Id$
+# $OpenPAM$
 
 SUBDIRS = security
diff --git a/include/security/Makefile.am b/include/security/Makefile.am
index 89e07ce..6fef73e 100644
--- a/include/security/Makefile.am
+++ b/include/security/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 securitydir = $(includedir)/security
 
diff --git a/include/security/openpam.h b/include/security/openpam.h
index 106ac1c..d254644 100644
--- a/include/security/openpam.h
+++ b/include/security/openpam.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_OPENPAM_H_INCLUDED
diff --git a/include/security/openpam_attr.h b/include/security/openpam_attr.h
index d632180..e710cfb 100644
--- a/include/security/openpam_attr.h
+++ b/include/security/openpam_attr.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED
diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h
index 88ae55d..39daa06 100644
--- a/include/security/openpam_version.h
+++ b/include/security/openpam_version.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h
index 9c4e3e4..0ccb606 100644
--- a/include/security/pam_appl.h
+++ b/include/security/pam_appl.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_PAM_APPL_H_INCLUDED
diff --git a/include/security/pam_constants.h b/include/security/pam_constants.h
index 8dcf244..a7889ac 100644
--- a/include/security/pam_constants.h
+++ b/include/security/pam_constants.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
diff --git a/include/security/pam_modules.h b/include/security/pam_modules.h
index 9e4ba05..42eb1c4 100644
--- a/include/security/pam_modules.h
+++ b/include/security/pam_modules.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_PAM_MODULES_H_INCLUDED
diff --git a/include/security/pam_types.h b/include/security/pam_types.h
index c995472..d2576f1 100644
--- a/include/security/pam_types.h
+++ b/include/security/pam_types.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef SECURITY_PAM_TYPES_H_INCLUDED
diff --git a/lib/Makefile.am b/lib/Makefile.am
index edc660b..3e0f69d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 SUBDIRS =
 
diff --git a/lib/libpam/Makefile.am b/lib/libpam/Makefile.am
index d0ef2a6..7808930 100644
--- a/lib/libpam/Makefile.am
+++ b/lib/libpam/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 NULL =
 
diff --git a/lib/libpam/openpam_asprintf.c b/lib/libpam/openpam_asprintf.c
index ce75568..0096d9b 100644
--- a/lib/libpam/openpam_asprintf.c
+++ b/lib/libpam/openpam_asprintf.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_asprintf.h b/lib/libpam/openpam_asprintf.h
index e1fd7c1..19257c5 100644
--- a/lib/libpam/openpam_asprintf.h
+++ b/lib/libpam/openpam_asprintf.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_ASPRINTF_H_INCLUDED
diff --git a/lib/libpam/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c
index 988e1f0..cc6444f 100644
--- a/lib/libpam/openpam_borrow_cred.c
+++ b/lib/libpam/openpam_borrow_cred.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c
index 35e3bc7..bf2161e 100644
--- a/lib/libpam/openpam_check_owner_perms.c
+++ b/lib/libpam/openpam_check_owner_perms.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_configure.c b/lib/libpam/openpam_configure.c
index 2d57237..e4ccf02 100644
--- a/lib/libpam/openpam_configure.c
+++ b/lib/libpam/openpam_configure.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_constants.c b/lib/libpam/openpam_constants.c
index 714c35d..0782990 100644
--- a/lib/libpam/openpam_constants.c
+++ b/lib/libpam/openpam_constants.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_constants.h b/lib/libpam/openpam_constants.h
index 76e07c8..0c1200d 100644
--- a/lib/libpam/openpam_constants.h
+++ b/lib/libpam/openpam_constants.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_CONSTANTS_H_INCLUDED
diff --git a/lib/libpam/openpam_cred.h b/lib/libpam/openpam_cred.h
index 8e792bf..1c21194 100644
--- a/lib/libpam/openpam_cred.h
+++ b/lib/libpam/openpam_cred.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_CRED_H_INCLUDED
diff --git a/lib/libpam/openpam_ctype.h b/lib/libpam/openpam_ctype.h
index 20efc34..4300b9d 100644
--- a/lib/libpam/openpam_ctype.h
+++ b/lib/libpam/openpam_ctype.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_CTYPE_H_INCLUDED
diff --git a/lib/libpam/openpam_debug.h b/lib/libpam/openpam_debug.h
index 4116289..c081889 100644
--- a/lib/libpam/openpam_debug.h
+++ b/lib/libpam/openpam_debug.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_DEBUG_H_INCLUDED
diff --git a/lib/libpam/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c
index c6ebf8a..b0aa883 100644
--- a/lib/libpam/openpam_dispatch.c
+++ b/lib/libpam/openpam_dispatch.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_dlfunc.h b/lib/libpam/openpam_dlfunc.h
index 4ef1402..a49673b 100644
--- a/lib/libpam/openpam_dlfunc.h
+++ b/lib/libpam/openpam_dlfunc.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_DLFCN_H_INCLUDED
diff --git a/lib/libpam/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c
index 5585469..6c6c3b9 100644
--- a/lib/libpam/openpam_dynamic.c
+++ b/lib/libpam/openpam_dynamic.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_features.c b/lib/libpam/openpam_features.c
index a06f15b..7620e82 100644
--- a/lib/libpam/openpam_features.c
+++ b/lib/libpam/openpam_features.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_features.h b/lib/libpam/openpam_features.h
index ef894f6..af3b53b 100644
--- a/lib/libpam/openpam_features.h
+++ b/lib/libpam/openpam_features.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_FEATURES_H_INCLUDED
diff --git a/lib/libpam/openpam_findenv.c b/lib/libpam/openpam_findenv.c
index 20619fd..f9d9b1a 100644
--- a/lib/libpam/openpam_findenv.c
+++ b/lib/libpam/openpam_findenv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_free_data.c b/lib/libpam/openpam_free_data.c
index 70e6ade..24874d1 100644
--- a/lib/libpam/openpam_free_data.c
+++ b/lib/libpam/openpam_free_data.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c
index 4afdd0e..0ebe515 100644
--- a/lib/libpam/openpam_free_envlist.c
+++ b/lib/libpam/openpam_free_envlist.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c
index d88cf65..7b13f3b 100644
--- a/lib/libpam/openpam_get_feature.c
+++ b/lib/libpam/openpam_get_feature.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_get_option.c b/lib/libpam/openpam_get_option.c
index bd787ac..2c291c4 100644
--- a/lib/libpam/openpam_get_option.c
+++ b/lib/libpam/openpam_get_option.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_impl.h b/lib/libpam/openpam_impl.h
index c7aa77a..5bc2287 100644
--- a/lib/libpam/openpam_impl.h
+++ b/lib/libpam/openpam_impl.h
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_IMPL_H_INCLUDED
diff --git a/lib/libpam/openpam_load.c b/lib/libpam/openpam_load.c
index 3ee24f6..0c4c27c 100644
--- a/lib/libpam/openpam_load.c
+++ b/lib/libpam/openpam_load.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_log.c b/lib/libpam/openpam_log.c
index b84a57b..c72c124 100644
--- a/lib/libpam/openpam_log.c
+++ b/lib/libpam/openpam_log.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c
index eb2e1aa..a560c88 100644
--- a/lib/libpam/openpam_nullconv.c
+++ b/lib/libpam/openpam_nullconv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_readline.c b/lib/libpam/openpam_readline.c
index e707e07..c5e86ba 100644
--- a/lib/libpam/openpam_readline.c
+++ b/lib/libpam/openpam_readline.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c
index a4653b0..48876e0 100644
--- a/lib/libpam/openpam_readlinev.c
+++ b/lib/libpam/openpam_readlinev.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_readword.c b/lib/libpam/openpam_readword.c
index 4ac8833..9c73005 100644
--- a/lib/libpam/openpam_readword.c
+++ b/lib/libpam/openpam_readword.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c
index 37c2c84..3ca0378 100644
--- a/lib/libpam/openpam_restore_cred.c
+++ b/lib/libpam/openpam_restore_cred.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c
index 114a99d..27c79ee 100644
--- a/lib/libpam/openpam_set_feature.c
+++ b/lib/libpam/openpam_set_feature.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_set_option.c b/lib/libpam/openpam_set_option.c
index 444c080..5533ac8 100644
--- a/lib/libpam/openpam_set_option.c
+++ b/lib/libpam/openpam_set_option.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_static.c b/lib/libpam/openpam_static.c
index 5e951e6..b239014 100644
--- a/lib/libpam/openpam_static.c
+++ b/lib/libpam/openpam_static.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_straddch.c b/lib/libpam/openpam_straddch.c
index 7150725..df7c48d 100644
--- a/lib/libpam/openpam_straddch.c
+++ b/lib/libpam/openpam_straddch.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_strlcat.c b/lib/libpam/openpam_strlcat.c
index b3ca87c..91e347b 100644
--- a/lib/libpam/openpam_strlcat.c
+++ b/lib/libpam/openpam_strlcat.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h
index a90a7ff..3329a72 100644
--- a/lib/libpam/openpam_strlcat.h
+++ b/lib/libpam/openpam_strlcat.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_STRLCAT_H_INCLUDED
diff --git a/lib/libpam/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h
index 5bb8ac2..c8252e1 100644
--- a/lib/libpam/openpam_strlcmp.h
+++ b/lib/libpam/openpam_strlcmp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_STRLCMP_H_INCLUDED
diff --git a/lib/libpam/openpam_strlcpy.c b/lib/libpam/openpam_strlcpy.c
index c856d9c..2882a6c 100644
--- a/lib/libpam/openpam_strlcpy.c
+++ b/lib/libpam/openpam_strlcpy.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h
index a8f0c8a..8184ea0 100644
--- a/lib/libpam/openpam_strlcpy.h
+++ b/lib/libpam/openpam_strlcpy.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_STRLCPY_H_INCLUDED
diff --git a/lib/libpam/openpam_strlset.c b/lib/libpam/openpam_strlset.c
index d4afe77..40c2a69 100644
--- a/lib/libpam/openpam_strlset.c
+++ b/lib/libpam/openpam_strlset.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_strlset.h b/lib/libpam/openpam_strlset.h
index c2f47ff..a665bc2 100644
--- a/lib/libpam/openpam_strlset.h
+++ b/lib/libpam/openpam_strlset.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_STRLSET_H_INCLUDED
diff --git a/lib/libpam/openpam_subst.c b/lib/libpam/openpam_subst.c
index 3b898b2..9143b4c 100644
--- a/lib/libpam/openpam_subst.c
+++ b/lib/libpam/openpam_subst.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c
index 49eb1bc..dd958a9 100644
--- a/lib/libpam/openpam_ttyconv.c
+++ b/lib/libpam/openpam_ttyconv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_vasprintf.c b/lib/libpam/openpam_vasprintf.c
index 71b95c7..c824ebe 100644
--- a/lib/libpam/openpam_vasprintf.c
+++ b/lib/libpam/openpam_vasprintf.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/openpam_vasprintf.h b/lib/libpam/openpam_vasprintf.h
index 3a51e95..7043e27 100644
--- a/lib/libpam/openpam_vasprintf.h
+++ b/lib/libpam/openpam_vasprintf.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef OPENPAM_VASPRINTF_H_INCLUDED
diff --git a/lib/libpam/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c
index c84284b..1a634f4 100644
--- a/lib/libpam/pam_acct_mgmt.c
+++ b/lib/libpam/pam_acct_mgmt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_authenticate.c b/lib/libpam/pam_authenticate.c
index f2b2bb1..43aa7bd 100644
--- a/lib/libpam/pam_authenticate.c
+++ b/lib/libpam/pam_authenticate.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c
index a23ce8b..f48efb7 100644
--- a/lib/libpam/pam_authenticate_secondary.c
+++ b/lib/libpam/pam_authenticate_secondary.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c
index 7c063dc..1ab704c 100644
--- a/lib/libpam/pam_chauthtok.c
+++ b/lib/libpam/pam_chauthtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_close_session.c b/lib/libpam/pam_close_session.c
index f87983e..72460be 100644
--- a/lib/libpam/pam_close_session.c
+++ b/lib/libpam/pam_close_session.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_end.c b/lib/libpam/pam_end.c
index 4bb7c60..d5e5580 100644
--- a/lib/libpam/pam_end.c
+++ b/lib/libpam/pam_end.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_error.c b/lib/libpam/pam_error.c
index b20b627..faae3bf 100644
--- a/lib/libpam/pam_error.c
+++ b/lib/libpam/pam_error.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c
index 14fccaa..0214987 100644
--- a/lib/libpam/pam_get_authtok.c
+++ b/lib/libpam/pam_get_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_data.c b/lib/libpam/pam_get_data.c
index d63e458..6f0d2cf 100644
--- a/lib/libpam/pam_get_data.c
+++ b/lib/libpam/pam_get_data.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_item.c b/lib/libpam/pam_get_item.c
index 38f4506..5d90e5d 100644
--- a/lib/libpam/pam_get_item.c
+++ b/lib/libpam/pam_get_item.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c
index 768b940..bd513e7 100644
--- a/lib/libpam/pam_get_mapped_authtok.c
+++ b/lib/libpam/pam_get_mapped_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c
index 61db024..607b264 100644
--- a/lib/libpam/pam_get_mapped_username.c
+++ b/lib/libpam/pam_get_mapped_username.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_get_user.c b/lib/libpam/pam_get_user.c
index a975c57..936f3e8 100644
--- a/lib/libpam/pam_get_user.c
+++ b/lib/libpam/pam_get_user.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_getenv.c b/lib/libpam/pam_getenv.c
index 60576e8..8c027b6 100644
--- a/lib/libpam/pam_getenv.c
+++ b/lib/libpam/pam_getenv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c
index 790fc9f..0f85e88 100644
--- a/lib/libpam/pam_getenvlist.c
+++ b/lib/libpam/pam_getenvlist.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_info.c b/lib/libpam/pam_info.c
index da636a6..2c52af9 100644
--- a/lib/libpam/pam_info.c
+++ b/lib/libpam/pam_info.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_open_session.c b/lib/libpam/pam_open_session.c
index 403d132..3bd424d 100644
--- a/lib/libpam/pam_open_session.c
+++ b/lib/libpam/pam_open_session.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_prompt.c b/lib/libpam/pam_prompt.c
index f1bbeee..dda5946 100644
--- a/lib/libpam/pam_prompt.c
+++ b/lib/libpam/pam_prompt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_putenv.c b/lib/libpam/pam_putenv.c
index e10f82a..7395050 100644
--- a/lib/libpam/pam_putenv.c
+++ b/lib/libpam/pam_putenv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_set_data.c b/lib/libpam/pam_set_data.c
index 0b578ac..d2250c7 100644
--- a/lib/libpam/pam_set_data.c
+++ b/lib/libpam/pam_set_data.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_set_item.c b/lib/libpam/pam_set_item.c
index 869ce3c..07dc405 100644
--- a/lib/libpam/pam_set_item.c
+++ b/lib/libpam/pam_set_item.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c
index f89cfed..3037752 100644
--- a/lib/libpam/pam_set_mapped_authtok.c
+++ b/lib/libpam/pam_set_mapped_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c
index 41dc368..599c20e 100644
--- a/lib/libpam/pam_set_mapped_username.c
+++ b/lib/libpam/pam_set_mapped_username.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_setcred.c b/lib/libpam/pam_setcred.c
index aef78ac..d5cdceb 100644
--- a/lib/libpam/pam_setcred.c
+++ b/lib/libpam/pam_setcred.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_setenv.c b/lib/libpam/pam_setenv.c
index b711de1..a5029ef 100644
--- a/lib/libpam/pam_setenv.c
+++ b/lib/libpam/pam_setenv.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c
index de3c86b..33abe0d 100644
--- a/lib/libpam/pam_sm_acct_mgmt.c
+++ b/lib/libpam/pam_sm_acct_mgmt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c
index 12158cf..46fb5a2 100644
--- a/lib/libpam/pam_sm_authenticate.c
+++ b/lib/libpam/pam_sm_authenticate.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c
index d6bb230..e09bde1 100644
--- a/lib/libpam/pam_sm_authenticate_secondary.c
+++ b/lib/libpam/pam_sm_authenticate_secondary.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c
index 7c06e23..e43ef19 100644
--- a/lib/libpam/pam_sm_chauthtok.c
+++ b/lib/libpam/pam_sm_chauthtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c
index bac23f6..a577446 100644
--- a/lib/libpam/pam_sm_close_session.c
+++ b/lib/libpam/pam_sm_close_session.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c
index adb24da..f3ebbeb 100644
--- a/lib/libpam/pam_sm_get_mapped_authtok.c
+++ b/lib/libpam/pam_sm_get_mapped_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c
index 3b547da..23af6cb 100644
--- a/lib/libpam/pam_sm_get_mapped_username.c
+++ b/lib/libpam/pam_sm_get_mapped_username.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c
index 30f34be..edc0adc 100644
--- a/lib/libpam/pam_sm_open_session.c
+++ b/lib/libpam/pam_sm_open_session.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c
index 86a5a2c..b674ba2 100644
--- a/lib/libpam/pam_sm_set_mapped_authtok.c
+++ b/lib/libpam/pam_sm_set_mapped_authtok.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c
index 6a08473..9ab2928 100644
--- a/lib/libpam/pam_sm_set_mapped_username.c
+++ b/lib/libpam/pam_sm_set_mapped_username.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c
index 705ce1f..ca673f5 100644
--- a/lib/libpam/pam_sm_setcred.c
+++ b/lib/libpam/pam_sm_setcred.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_start.c b/lib/libpam/pam_start.c
index 532e4b7..c09c49b 100644
--- a/lib/libpam/pam_start.c
+++ b/lib/libpam/pam_start.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_strerror.c b/lib/libpam/pam_strerror.c
index fe37235..d6ce3a4 100644
--- a/lib/libpam/pam_strerror.c
+++ b/lib/libpam/pam_strerror.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_verror.c b/lib/libpam/pam_verror.c
index 52cde45..fefe6fb 100644
--- a/lib/libpam/pam_verror.c
+++ b/lib/libpam/pam_verror.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_vinfo.c b/lib/libpam/pam_vinfo.c
index 1facbb6..0b778dc 100644
--- a/lib/libpam/pam_vinfo.c
+++ b/lib/libpam/pam_vinfo.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/lib/libpam/pam_vprompt.c b/lib/libpam/pam_vprompt.c
index 8a898dd..eeb1909 100644
--- a/lib/libpam/pam_vprompt.c
+++ b/lib/libpam/pam_vprompt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/misc/bumpdates.sh b/misc/bumpdates.sh
index 65cb6d6..ac8e298 100755
--- a/misc/bumpdates.sh
+++ b/misc/bumpdates.sh
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id$
+# $OpenPAM$
 #
 
 error() {
diff --git a/misc/gendoc.pl b/misc/gendoc.pl
index 1247b88..a118e36 100644
--- a/misc/gendoc.pl
+++ b/misc/gendoc.pl
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id$
+# $OpenPAM$
 #
 
 use strict;
@@ -134,7 +134,7 @@ sub parse_source($) {
     return undef
 	if ($source =~ m/^ \* NOPARSE\s*$/m);
 
-    if ($source =~ m/(\$Id:[^\$]+\$)/) {
+    if ($source =~ m/(\$OpenPAM:[^\$]+\$)/) {
 	$version = $1;
     }
 
diff --git a/misc/relname.pl b/misc/relname.pl
index 3d780eb..41fd274 100755
--- a/misc/relname.pl
+++ b/misc/relname.pl
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id$
+# $OpenPAM$
 #
 
 use strict;
diff --git a/mkpkgng.in b/mkpkgng.in
index 5906f38..14745e8 100644
--- a/mkpkgng.in
+++ b/mkpkgng.in
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id$
+# $OpenPAM$
 #
 
 # Print an informational message
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 211d601..8f69100 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 SUBDIRS = pam_deny pam_permit pam_return
 
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index e28d2ee..a4b3cc8 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 if CUSTOM_MODULES_DIR
 moduledir = $(OPENPAM_MODULES_DIR)
diff --git a/modules/pam_deny/pam_deny.c b/modules/pam_deny/pam_deny.c
index 0210caf..75f1f56 100644
--- a/modules/pam_deny/pam_deny.c
+++ b/modules/pam_deny/pam_deny.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 2651cca..9b9a0e3 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 if CUSTOM_MODULES_DIR
 moduledir = $(OPENPAM_MODULES_DIR)
diff --git a/modules/pam_permit/pam_permit.c b/modules/pam_permit/pam_permit.c
index 0c143f7..a9c8d71 100644
--- a/modules/pam_permit/pam_permit.c
+++ b/modules/pam_permit/pam_permit.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/modules/pam_return/Makefile.am b/modules/pam_return/Makefile.am
index 20826a4..d768a67 100644
--- a/modules/pam_return/Makefile.am
+++ b/modules/pam_return/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 if CUSTOM_MODULES_DIR
 moduledir = $(OPENPAM_MODULES_DIR)
diff --git a/modules/pam_return/pam_return.c b/modules/pam_return/pam_return.c
index f4f46d6..95c8ee8 100644
--- a/modules/pam_return/pam_return.c
+++ b/modules/pam_return/pam_return.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index ce36f1d..76f56ae 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 if CUSTOM_MODULES_DIR
 moduledir = $(OPENPAM_MODULES_DIR)
diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c
index 2f8f0df..5e57104 100644
--- a/modules/pam_unix/pam_unix.c
+++ b/modules/pam_unix/pam_unix.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/Makefile.am b/t/Makefile.am
index 738c276..d597bb6 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,4 +1,4 @@
-# $Id$
+# $OpenPAM$
 
 if WITH_TEST
 
diff --git a/t/t_openpam_ctype.c b/t/t_openpam_ctype.c
index 49a951e..ecb6c58 100644
--- a/t/t_openpam_ctype.c
+++ b/t/t_openpam_ctype.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/t_openpam_dispatch.c b/t/t_openpam_dispatch.c
index eed18cd..20cd8c2 100644
--- a/t/t_openpam_dispatch.c
+++ b/t/t_openpam_dispatch.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/t_openpam_readlinev.c b/t/t_openpam_readlinev.c
index 71d4033..9f29281 100644
--- a/t/t_openpam_readlinev.c
+++ b/t/t_openpam_readlinev.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/t_openpam_readword.c b/t/t_openpam_readword.c
index 05acbda..b1f0ff9 100644
--- a/t/t_openpam_readword.c
+++ b/t/t_openpam_readword.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/t_pam_conv.c b/t/t_pam_conv.c
index 2aab5a4..2a85c62 100644
--- a/t/t_pam_conv.c
+++ b/t/t_pam_conv.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/t/t_pam_conv.h b/t/t_pam_conv.h
index f05e76a..490aa8d 100644
--- a/t/t_pam_conv.h
+++ b/t/t_pam_conv.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $OpenPAM$
  */
 
 #ifndef T_PAM_CONV_H_INCLUDED