diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
index 8750c21..a4e8e10 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
@@ -1,28 +1,25 @@
 /************************************************************************
-*
-*  ConfigurationDialogBase.java
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License version 2.1, as published by the Free Software Foundation.
-*
-*  This 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 this library; if not, write to the Free Software
-*  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*  MA  02111-1307  USA
-*
-*  Copyright: 2002-2015 by Henrik Just
-*
-*  All Rights Reserved.
-* 
-*  Version 1.6 (2015-04-09)
-*
-*/ 
+ *
+ *  ConfigurationDialogBase.java
+ *
+ *  Copyright: 2002-2015 by Henrik Just
+ *
+ *  Writer2LaTeX 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.
+ *  
+ *  Writer2LaTeX 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 Writer2LaTeX.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Version 1.6 (2015-04-09)
+ *
+ */ 
 
 package org.openoffice.da.comp.w2lcommon.filter;
 
diff --git a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java
index e365ef1..0a8e689 100644
--- a/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java
+++ b/source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java
@@ -1,28 +1,27 @@
 /************************************************************************
-*
-*  ConfigurationDialog.java
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License version 2.1, as published by the Free Software Foundation.
-*
-*  This 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 this library; if not, write to the Free Software
-*  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*  MA  02111-1307  USA
-*
-*  Copyright: 2002-2015 by Henrik Just
-*
-*  All Rights Reserved.
-* 
-*  Version 1.6 (2015-06-16)
-*
-*/ 
+ *
+ *  ConfigurationDialog.java
+ *
+ *  Copyright: 2002-2015 by Henrik Just
+ *
+ *  This file is part of Writer2LaTeX.
+ *  
+ *  Writer2LaTeX 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.
+ *  
+ *  Writer2LaTeX 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 Writer2LaTeX.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Version 1.6 (2015-06-16)
+ *
+ */ 
 
 package org.openoffice.da.comp.writer2xhtml;
 
diff --git a/source/java/writer2latex/base/ContentEntryImpl.java b/source/java/writer2latex/base/ContentEntryImpl.java
index 3a56f6c..e47bd34 100644
--- a/source/java/writer2latex/base/ContentEntryImpl.java
+++ b/source/java/writer2latex/base/ContentEntryImpl.java
@@ -1,28 +1,27 @@
 /************************************************************************
-*
-*  ConverterResultImpl.java
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License version 2.1, as published by the Free Software Foundation.
-*
-*  This 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 this library; if not, write to the Free Software
-*  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*  MA  02111-1307  USA
-*
-*  Copyright: 2002-2010 by Henrik Just
-*
-*  All Rights Reserved.
-* 
-*  Version 1.2 (2010-03-24)
-*
-*/ 
+ *
+ *  ConverterResultImpl.java
+ *
+ *  Copyright: 2002-2010 by Henrik Just
+ *
+ *  This file is part of Writer2LaTeX.
+ *  
+ *  Writer2LaTeX 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.
+ *  
+ *  Writer2LaTeX 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 Writer2LaTeX.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Version 1.2 (2010-03-24)
+ *
+ */ 
 
 package writer2latex.base;
 
diff --git a/source/java/writer2latex/base/ConverterResultImpl.java b/source/java/writer2latex/base/ConverterResultImpl.java
index c308edb..d490b45 100644
--- a/source/java/writer2latex/base/ConverterResultImpl.java
+++ b/source/java/writer2latex/base/ConverterResultImpl.java
@@ -1,28 +1,27 @@
 /************************************************************************
-*
-*  ConverterResultImpl.java
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License version 2.1, as published by the Free Software Foundation.
-*
-*  This 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 this library; if not, write to the Free Software
-*  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*  MA  02111-1307  USA
-*
-*  Copyright: 2002-2011 by Henrik Just
-*
-*  All Rights Reserved.
-* 
-*  Version 1.2 (2011-07-20)
-*
-*/ 
+ *
+ *  ConverterResultImpl.java
+ *
+ *  Copyright: 2002-2011 by Henrik Just
+ *
+ *  This file is part of Writer2LaTeX.
+ *  
+ *  Writer2LaTeX 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.
+ *  
+ *  Writer2LaTeX 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 Writer2LaTeX.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Version 1.2 (2011-07-20)
+ *
+ */ 
 
 package writer2latex.base;
 
diff --git a/source/java/writer2latex/bibtex/BibTeXEntryMap.java b/source/java/writer2latex/bibtex/BibTeXEntryMap.java
index 8371913..ae3ef5c 100644
--- a/source/java/writer2latex/bibtex/BibTeXEntryMap.java
+++ b/source/java/writer2latex/bibtex/BibTeXEntryMap.java
@@ -2,20 +2,6 @@
  *
  *  BibTeXEntryMap.java
  *
- *  This library is free software); you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This 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 this library); if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
  *  Copyright: 2002-2014 by Henrik Just
  *
  *  This file is part of Writer2LaTeX.