diff --git a/safe-parcel/build.gradle b/safe-parcel/build.gradle
index afe152a..d26bd13 100644
--- a/safe-parcel/build.gradle
+++ b/safe-parcel/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * 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/safe-parcel/gradle.properties b/safe-parcel/gradle.properties
index 3981d02..9d95f32 100644
--- a/safe-parcel/gradle.properties
+++ b/safe-parcel/gradle.properties
@@ -1,3 +1,19 @@
+#
+# Copyright 2013-2015 microG Project Team
+#
+# 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.
+#
+
 POM_NAME=SafeParcel
 POM_DESCRIPTION=Easy-to-use implementation of the "SafeParcel" format used for IPC in Play Services
 
diff --git a/safe-parcel/src/main/AndroidManifest.xml b/safe-parcel/src/main/AndroidManifest.xml
index ff7d34c..8eb06d8 100644
--- a/safe-parcel/src/main/AndroidManifest.xml
+++ b/safe-parcel/src/main/AndroidManifest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 microG Project Team
+  ~
+  ~ 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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microg.safeparcel">
 
diff --git a/safe-parcel/src/main/java/org/microg/safeparcel/AutoSafeParcelable.java b/safe-parcel/src/main/java/org/microg/safeparcel/AutoSafeParcelable.java
index e9c41b2..937e2f3 100644
--- a/safe-parcel/src/main/java/org/microg/safeparcel/AutoSafeParcelable.java
+++ b/safe-parcel/src/main/java/org/microg/safeparcel/AutoSafeParcelable.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG Project Team
+ *
+ * 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 org.microg.safeparcel;
 
 import android.os.Parcel;
diff --git a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelReader.java b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelReader.java
index 1208157..43093ed 100644
--- a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelReader.java
+++ b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelReader.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 μg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * 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
+ *     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,
diff --git a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelWriter.java b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelWriter.java
index d3eb623..17f0942 100644
--- a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelWriter.java
+++ b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelWriter.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 μg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * 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
+ *     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,
diff --git a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelable.java b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelable.java
index 1496fc1..391050c 100644
--- a/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelable.java
+++ b/safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelable.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 μg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * 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
+ *     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,