diff --git a/Makefile.in b/Makefile.in
index 132d90bb..416c45b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,8 +28,8 @@ $(info Building against PostgreSQL $(MAJORVERSION))
 
 REPMGR_CLIENT_OBJS = repmgr-client.o \
   repmgr-action-primary.o repmgr-action-standby.o repmgr-action-bdr.o repmgr-action-cluster.o \
-  config.o log.o strutil.o dbutils.o dirutil.o compat.o controldata.o
-REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o config.o log.o dbutils.o strutil.o
+  configfile.o log.o strutil.o dbutils.o dirutil.o compat.o controldata.o
+REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o configfile.o log.o dbutils.o strutil.o
 
 $(REPMGR_CLIENT_OBJS): repmgr-client.h
 
@@ -61,7 +61,7 @@ additional-clean:
 	rm -f repmgrd-physical.o
 	rm -f repmgrd-bdr.o
 	rm -f compat.o
-	rm -f config.o
+	rm -f configfile.o
 	rm -f controldata.o
 	rm -f dbutils.o
 	rm -f dirutil.o
diff --git a/config.c b/configfile.c
similarity index 99%
rename from config.c
rename to configfile.c
index 0b8cc45e..4f920ebd 100644
--- a/config.c
+++ b/configfile.c
@@ -7,7 +7,7 @@
 #include <sys/stat.h>			/* for stat() */
 
 #include "repmgr.h"
-#include "config.h"
+#include "configfile.h"
 #include "log.h"
 
 const static char *_progname = NULL;
diff --git a/config.h b/configfile.h
similarity index 99%
rename from config.h
rename to configfile.h
index 87e00722..499ee5f5 100644
--- a/config.h
+++ b/configfile.h
@@ -1,5 +1,5 @@
 /*
- * config.h
+ * configfile.h
  *
  * Copyright (c) 2ndQuadrant, 2010-2017
  *
diff --git a/dbutils.h b/dbutils.h
index adae6848..5cd640e9 100644
--- a/dbutils.h
+++ b/dbutils.h
@@ -11,7 +11,7 @@
 #include "pqexpbuffer.h"
 #include "portability/instr_time.h"
 
-#include "config.h"
+#include "configfile.h"
 #include "strutil.h"
 #include "voting.h"
 
diff --git a/repmgr-client-global.h b/repmgr-client-global.h
index 8a5038b9..b033f448 100644
--- a/repmgr-client-global.h
+++ b/repmgr-client-global.h
@@ -6,7 +6,7 @@
 #ifndef _REPMGR_CLIENT_GLOBAL_H_
 #define _REPMGR_CLIENT_GLOBAL_H_
 
-#include "config.h"
+#include "configfile.h"
 
 /* values for --copy-external-config-files */
 #define CONFIG_FILE_SAMEPATH 1
diff --git a/repmgr.h b/repmgr.h
index a627e413..649cc6a7 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -15,7 +15,7 @@
 #include "repmgr_version.h"
 #include "errcode.h"
 #include "strutil.h"
-#include "config.h"
+#include "configfile.h"
 #include "dbutils.h"
 #include "log.h"
 
@@ -51,4 +51,5 @@
 #define ERRBUFF_SIZE 512
 
 
+
 #endif /* _REPMGR_H_ */
diff --git a/repmgrd-bdr.c b/repmgrd-bdr.c
index ca019079..e2e299d5 100644
--- a/repmgrd-bdr.c
+++ b/repmgrd-bdr.c
@@ -9,7 +9,7 @@
 #include "repmgr.h"
 #include "repmgrd.h"
 #include "repmgrd-bdr.h"
-#include "config.h"
+#include "configfile.h"
 
 
 static volatile sig_atomic_t got_SIGHUP = false;
diff --git a/repmgrd.c b/repmgrd.c
index 59d21e6f..f05b58f0 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -10,13 +10,11 @@
 #include <sys/stat.h>
 
 
-
-
 #include "repmgr.h"
 #include "repmgrd.h"
 #include "repmgrd-physical.h"
 #include "repmgrd-bdr.h"
-#include "config.h"
+#include "configfile.h"
 #include "voting.h"
 
 #define OPT_HELP	1