diff --git a/LICENSE b/LICENSE
index e06d20818..d64569567 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Apache License
+
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,7 +179,7 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +187,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +200,3 @@ Apache License
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
diff --git a/src/main/java/li/strolch/tutorialapp/main/Main.java b/src/main/java/li/strolch/tutorialapp/main/Main.java
index 49ece783f..a18e5d82a 100644
--- a/src/main/java/li/strolch/tutorialapp/main/Main.java
+++ b/src/main/java/li/strolch/tutorialapp/main/Main.java
@@ -1,23 +1,17 @@
 /*
- * Copyright (c) 2012, Robert von Burg
- *
- * All rights reserved.
- *
- * This file is part of the XXX.
- *
- *  XXX 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.
- *
- *  XXX 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 XXX.  If not, see 
- *  <http://www.gnu.org/licenses/>.
+ * Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package li.strolch.tutorialapp.main;
 
diff --git a/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java b/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
index 93d4ac4b5..3121b82e9 100644
--- a/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
+++ b/src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
@@ -1,23 +1,17 @@
 /*
- * Copyright (c) 2012, Robert von Burg
- *
- * All rights reserved.
- *
- * This file is part of the XXX.
- *
- *  XXX 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.
- *
- *  XXX 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 XXX.  If not, see 
- *  <http://www.gnu.org/licenses/>.
+ * Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package li.strolch.tutorialapp.postinitializer;