diff --git a/LICENSE.txt b/LICENSE.txt
index d645695673349e3947e8e5ae42332d0ac3164cd7..3842e75efc359fffa9a2f67dde69a7e93a94df28 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -176,18 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   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 "[]"
-      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
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2015 Teetime (http://teetime.sourceforge.net)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 4631f1391fc6ceb022e4a4755db9da228bcfafe4..e704e6814a96d4ad9169030c4ff147f8d2ef3be4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
 	<name>TeeTime</name>
 	<description>TeeTime is a Pipes-and-Filters framework for Java</description>
 	<url>http://teetime.sourceforge.org</url>
+	<inceptionYear>2015</inceptionYear>
 
 	<licenses>
 		<license>
@@ -115,7 +116,7 @@
 
 	<build>
 		<plugins>
-			
+
 			<!-- we want JDK 1.6 source and binary compatibility -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -282,6 +283,30 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+
+			<!-- Copyright Header -->
+			<plugin>
+				<groupId>com.mycila</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</header>
+					<properties>
+						<owner>TeeTime</owner>
+						<email>http://teetime.sourceforge.net</email>
+					</properties>
+					<includes>
+						<include>**/*.java</include>
+					</includes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/run-configurations/update headers.launch b/run-configurations/update headers.launch
new file mode 100644
index 0000000000000000000000000000000000000000..50c6f16aa7beb6236ff5e982ff63305f9a2ab4ba
--- /dev/null
+++ b/run-configurations/update headers.launch	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="license:format"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="libexec"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}"/>
+</launchConfiguration>