diff --git a/server/config_init.c b/server/config_init.c
index 170b6552..757aa75e 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    config_init.c
diff --git a/server/config_init.h b/server/config_init.h
index c8485baa..8748e827 100644
--- a/server/config_init.h
+++ b/server/config_init.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    fwknop.h
diff --git a/server/fwknopd.h b/server/fwknopd.h
index daa941cf..0041b392 100644
--- a/server/fwknopd.h
+++ b/server/fwknopd.h
@@ -1,4 +1,4 @@
-/* $Id: fwknop.h 95 2009-06-07 16:55:22Z dstuart $
+/* $Id$
  *****************************************************************************
  *
  * File:    fwknopd.h
diff --git a/server/fwknopd_common.h b/server/fwknopd_common.h
index 9ce0bf86..16e431c0 100644
--- a/server/fwknopd_common.h
+++ b/server/fwknopd_common.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    fwknopd_common.h
diff --git a/server/incoming_spa.h b/server/incoming_spa.h
index 511e405c..cae8e9a3 100644
--- a/server/incoming_spa.h
+++ b/server/incoming_spa.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    incoming_spa.h
diff --git a/server/log_msg.c b/server/log_msg.c
index f76fc925..056cbc41 100644
--- a/server/log_msg.c
+++ b/server/log_msg.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    log_msg.c
diff --git a/server/log_msg.h b/server/log_msg.h
index 0e4838f9..e34e8feb 100644
--- a/server/log_msg.h
+++ b/server/log_msg.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    log_msg.h
diff --git a/server/pcap_capture.h b/server/pcap_capture.h
index 5a92e8e4..a591b775 100644
--- a/server/pcap_capture.h
+++ b/server/pcap_capture.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    pcap_capture.h
diff --git a/server/process_packet.c b/server/process_packet.c
index 2fa00c65..8a1bf3ba 100644
--- a/server/process_packet.c
+++ b/server/process_packet.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    process_packet.c
diff --git a/server/process_packet.h b/server/process_packet.h
index e11f5e1d..6e90ad7b 100644
--- a/server/process_packet.h
+++ b/server/process_packet.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    process_packet.h
diff --git a/server/replay_dbm.c b/server/replay_dbm.c
index 5462277c..7f421288 100644
--- a/server/replay_dbm.c
+++ b/server/replay_dbm.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    replay_dbm.c
diff --git a/server/replay_dbm.h b/server/replay_dbm.h
index a5a54792..7e095af8 100644
--- a/server/replay_dbm.h
+++ b/server/replay_dbm.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    replay_dbm.h
diff --git a/server/sig_handler.c b/server/sig_handler.c
index 2db99281..cef39051 100644
--- a/server/sig_handler.c
+++ b/server/sig_handler.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    sig_handler.c
diff --git a/server/sig_handler.h b/server/sig_handler.h
index edec2c3d..18a6efd3 100644
--- a/server/sig_handler.h
+++ b/server/sig_handler.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    sig_handler.h
diff --git a/server/utils.c b/server/utils.c
index 3acbbc7c..3b52ce54 100644
--- a/server/utils.c
+++ b/server/utils.c
@@ -1,4 +1,4 @@
-/* $Id: utils.c 63 2009-02-12 05:05:40Z mbr $
+/* $Id$
  *****************************************************************************
  *
  * File:    utils.c
diff --git a/server/utils.h b/server/utils.h
index 35af0669..b0cb04e0 100644
--- a/server/utils.h
+++ b/server/utils.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    utils.h