diff --git a/include/ecrt.h b/include/ecrt.h
index 15d46a37..eddbb938 100644
--- a/include/ecrt.h
+++ b/include/ecrt.h
@@ -1,33 +1,32 @@
 /******************************************************************************
  *
- *  $Id$
+ * $Id$
  *
- *  Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
+ * Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
  *
- *  This file is part of the IgH EtherCAT Master.
+ * This file is part of the IgH EtherCAT master userspace library.
+ * 
+ * The IgH EtherCAT master userspace library is free software; you can
+ * redistribute it and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation; version 2.1 of
+ * the License.
  *
- *  The IgH EtherCAT Master 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 2 of the
- *  License, or (at your option) any later version.
+ * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
  *
- *  The IgH EtherCAT Master 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 the IgH EtherCAT Master; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *  The right to use EtherCAT Technology is granted and comes free of
- *  charge under condition of compatibility of product made by
- *  Licensee. People intending to distribute/sell products based on the
- *  code, have to sign an agreement to guarantee that products using
- *  software based on IgH EtherCAT master stay compatible with the actual
- *  EtherCAT specification (which are released themselves as an open
- *  standard) as the (only) precondition to have the right to use EtherCAT
- *  Technology, IP and trade marks.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the IgH EtherCAT master userspace library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ * 
+ * The right to use EtherCAT Technology is granted and comes free of charge
+ * under condition of compatibility of product made by Licensee. People
+ * intending to distribute/sell products based on the code, have to sign an
+ * agreement to guarantee that products using software based on IgH EtherCAT
+ * master stay compatible with the actual EtherCAT specification (which are
+ * released themselves as an open standard) as the (only) precondition to have
+ * the right to use EtherCAT Technology, IP and trade marks.
  *
  *****************************************************************************/
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f8b15a6b..ada1e0a3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,16 +6,16 @@
 #
 # This file is part of the IgH EtherCAT master userspace library.
 #
-# The IgH EtherCAT master userspace library is free software: you can
+# The IgH EtherCAT master userspace library is free software; you can
 # redistribute it and/or modify it under the terms of the GNU Lesser General
-# Public License as published by the Free Software Foundation, version 2 of
+# Public License as published by the Free Software Foundation; version 2.1 of
 # the License.
-#
+# 
 # The IgH EtherCAT master userspace library 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 Lesser
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
 # General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU Lesser General Public License
 # along with the IgH EtherCAT master userspace library. If not, see
 # <http://www.gnu.org/licenses/>.
diff --git a/lib/common.c b/lib/common.c
index 5a2a6642..f521b36d 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/domain.c b/lib/domain.c
index 3e576647..c9f3bb91 100644
--- a/lib/domain.c
+++ b/lib/domain.c
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/domain.h b/lib/domain.h
index 7bfe5aed..5a5a531b 100644
--- a/lib/domain.h
+++ b/lib/domain.h
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/master.c b/lib/master.c
index 079c561f..db93f1ad 100644
--- a/lib/master.c
+++ b/lib/master.c
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/master.h b/lib/master.h
index d45635d0..56b3e0a3 100644
--- a/lib/master.h
+++ b/lib/master.h
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/slave_config.c b/lib/slave_config.c
index 4c3a578d..8bc0a49f 100644
--- a/lib/slave_config.c
+++ b/lib/slave_config.c
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/slave_config.h b/lib/slave_config.h
index 24fe1c27..2a5f1509 100644
--- a/lib/slave_config.h
+++ b/lib/slave_config.h
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/voe_handler.c b/lib/voe_handler.c
index a712b8e5..92cc9c67 100644
--- a/lib/voe_handler.c
+++ b/lib/voe_handler.c
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.
diff --git a/lib/voe_handler.h b/lib/voe_handler.h
index 4d93438c..fb44206d 100644
--- a/lib/voe_handler.h
+++ b/lib/voe_handler.h
@@ -6,16 +6,16 @@
  * 
  * This file is part of the IgH EtherCAT master userspace library.
  * 
- * The IgH EtherCAT master userspace library is free software: you can
+ * The IgH EtherCAT master userspace library is free software; you can
  * redistribute it and/or modify it under the terms of the GNU Lesser General
- * Public License as published by the Free Software Foundation, version 2 of
+ * Public License as published by the Free Software Foundation; version 2.1 of
  * the License.
- * 
+ *
  * The IgH EtherCAT master userspace library 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 Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with the IgH EtherCAT master userspace library. If not, see
  * <http://www.gnu.org/licenses/>.