diff --git a/check_dir.c b/check_dir.c
index d63d7c2a..94e66c0b 100644
--- a/check_dir.c
+++ b/check_dir.c
@@ -1,8 +1,20 @@
 /*
- * check_dir.c
- * Copyright (c) 2ndQuadrant, 2010
+ * check_dir.c - Directories management functions
+ * Copyright (C) 2ndQuadrant, 2010
  *
- * Directories management functions
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include <sys/stat.h>
diff --git a/check_dir.h b/check_dir.h
index 53705136..e42c92fd 100644
--- a/check_dir.h
+++ b/check_dir.h
@@ -1,6 +1,19 @@
 /*
  * check_dir.h
  * Copyright (c) 2ndQuadrant, 2010
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/config.c b/config.c
index 63f4b2d1..d7512483 100644
--- a/config.c
+++ b/config.c
@@ -1,8 +1,20 @@
 /*
- * config.c
- * Copyright (c) 2ndQuadrant, 2010
+ * config.c - Functions to parse the config file
+ * Copyright (C) 2ndQuadrant, 2010
  *
- * Functions to parse the config file
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "repmgr.h"
diff --git a/config.h b/config.h
index 139bfd32..70a66472 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,19 @@
 /*
  * config.h
  * Copyright (c) 2ndQuadrant, 2010
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/dbutils.c b/dbutils.c
index a9b38307..3749b9f0 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -1,9 +1,20 @@
 /*
- * dbutils.c
- * Copyright (c) 2ndQuadrant, 2010
- *
- * Database connection/management functions
+ * dbutils.c - Database connection/management functions
+ * Copyright (C) 2ndQuadrant, 2010
  *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "repmgr.h"
diff --git a/dbutils.h b/dbutils.h
index 3bbbca67..32666cf7 100644
--- a/dbutils.h
+++ b/dbutils.h
@@ -1,6 +1,19 @@
 /*
  * dbutils.h
  * Copyright (c) 2ndQuadrant, 2010
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/repmgr.c b/repmgr.c
index eb91e6ed..70103f87 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -1,14 +1,27 @@
 /*
- * repmgr.c
- * Copyright (c) 2ndQuadrant, 2010
+ * repmgr.c - Command interpreter for the repmgr
+ * Copyright (C) 2ndQuadrant, 2010
  *
- * Command interpreter for the repmgr
  * This module is a command-line utility to easily setup a cluster of
  * hot standby servers for an HA environment
  * 
  * Commands implemented are.
  * MASTER REGISTER, STANDBY REGISTER, STANDBY CLONE, STANDBY FOLLOW, 
  * STANDBY PROMOTE
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "repmgr.h"
diff --git a/repmgr.h b/repmgr.h
index 5e152174..e099f62c 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -1,6 +1,19 @@
 /*
- * dbutils.h
+ * repmgr.h
  * Copyright (c) 2ndQuadrant, 2010
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/repmgrd.c b/repmgrd.c
index 7d3b3e91..ee646a87 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -1,10 +1,23 @@
 /*
- * repmgrd.c
- * Copyright (c) 2ndQuadrant, 2010
+ * repmgrd.c - Replication manager daemon
+ * Copyright (C) 2ndQuadrant, 2010
  *
- * Replication manager daemon
  * This module connects to the nodes of a replication cluster and monitors
  * how far are they from master 
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
  */
 
 #include <signal.h>