diff --git a/client/config_init.c b/client/config_init.c
index a4fdb195..5e020a3a 100644
--- a/client/config_init.c
+++ b/client/config_init.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    config_init.c
diff --git a/client/config_init.h b/client/config_init.h
index 31a2c5cb..d2c4461b 100644
--- a/client/config_init.h
+++ b/client/config_init.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    fwknop.h
diff --git a/client/fwknop_common.h b/client/fwknop_common.h
index e450048c..5f88130f 100644
--- a/client/fwknop_common.h
+++ b/client/fwknop_common.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  ******************************************************************************
  *
  * File:    fwknop_common.h
diff --git a/client/http_resolve_host.c b/client/http_resolve_host.c
index 4d0aeb60..5eb00354 100644
--- a/client/http_resolve_host.c
+++ b/client/http_resolve_host.c
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    http_resolve_host.c
@@ -43,11 +43,11 @@ int
 resolve_ip_http(fko_cli_options_t *options)
 {
     int     sock, res, error, http_buf_len, i;
-	int		o1, o2, o3, o4;
+    int     o1, o2, o3, o4;
     struct  addrinfo *result, *rp, hints;
     char    http_buf[HTTP_MAX_REQUEST_LEN];
-	char    http_response[HTTP_MAX_RESPONSE_LEN] = {0};
-	char   *ndx;
+    char    http_response[HTTP_MAX_RESPONSE_LEN] = {0};
+    char   *ndx;
 
 #ifdef WIN32
     WSADATA wsa_data;
diff --git a/client/utils.h b/client/utils.h
index dde341c6..68edd78c 100644
--- a/client/utils.h
+++ b/client/utils.h
@@ -1,4 +1,4 @@
-/*
+/* $Id$
  *****************************************************************************
  *
  * File:    utils.h