diff --git a/Makefile b/Makefile
index 8ed10e51..fcc3f4e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2015 Philipp Oppermann. See the README.md
+# Copyright 2016 Philipp Oppermann. See the README.md
 # file at the top-level directory of this distribution.
 #
 # Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/arch/x86_64/boot.asm b/src/arch/x86_64/boot.asm
index 64d0c0db..a9d7a6bb 100644
--- a/src/arch/x86_64/boot.asm
+++ b/src/arch/x86_64/boot.asm
@@ -1,4 +1,4 @@
-; Copyright 2015 Philipp Oppermann. See the README.md
+; Copyright 2016 Philipp Oppermann. See the README.md
 ; file at the top-level directory of this distribution.
 ;
 ; Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/arch/x86_64/grub.cfg b/src/arch/x86_64/grub.cfg
index 957419e3..dbe53c10 100644
--- a/src/arch/x86_64/grub.cfg
+++ b/src/arch/x86_64/grub.cfg
@@ -1,4 +1,4 @@
-# Copyright 2015 Philipp Oppermann. See the README.md
+# Copyright 2016 Philipp Oppermann. See the README.md
 # file at the top-level directory of this distribution.
 #
 # Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/arch/x86_64/linker.ld b/src/arch/x86_64/linker.ld
index bbf83adf..62f8f266 100644
--- a/src/arch/x86_64/linker.ld
+++ b/src/arch/x86_64/linker.ld
@@ -1,5 +1,5 @@
 /*
-Copyright 2015 Philipp Oppermann. See the README.md
+Copyright 2016 Philipp Oppermann. See the README.md
 file at the top-level directory of this distribution.
 
 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/arch/x86_64/long_mode_init.asm b/src/arch/x86_64/long_mode_init.asm
index 1fce994d..83fa8f46 100644
--- a/src/arch/x86_64/long_mode_init.asm
+++ b/src/arch/x86_64/long_mode_init.asm
@@ -1,4 +1,4 @@
-; Copyright 2015 Philipp Oppermann. See the README.md
+; Copyright 2016 Philipp Oppermann. See the README.md
 ; file at the top-level directory of this distribution.
 ;
 ; Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/arch/x86_64/multiboot_header.asm b/src/arch/x86_64/multiboot_header.asm
index 2c9c47d2..0b3f83bb 100644
--- a/src/arch/x86_64/multiboot_header.asm
+++ b/src/arch/x86_64/multiboot_header.asm
@@ -1,4 +1,4 @@
-; Copyright 2015 Philipp Oppermann. See the README.md
+; Copyright 2016 Philipp Oppermann. See the README.md
 ; file at the top-level directory of this distribution.
 ;
 ; Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/interrupts/idt.rs b/src/interrupts/idt.rs
index 668c3ba5..44d18e6f 100644
--- a/src/interrupts/idt.rs
+++ b/src/interrupts/idt.rs
@@ -1,3 +1,12 @@
+// Copyright 2016 Philipp Oppermann. See the README.md
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 use x86::segmentation::{self, SegmentSelector};
 
 pub struct Idt([Entry; 16]);
diff --git a/src/interrupts/mod.rs b/src/interrupts/mod.rs
index d3d441d2..4a148d8e 100644
--- a/src/interrupts/mod.rs
+++ b/src/interrupts/mod.rs
@@ -1,3 +1,12 @@
+// Copyright 2016 Philipp Oppermann. See the README.md
+// file at the top-level directory of this distribution.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 mod idt;
 
 macro_rules! save_scratch_registers {
diff --git a/src/lib.rs b/src/lib.rs
index 213dcb39..2fe895a4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/area_frame_allocator.rs b/src/memory/area_frame_allocator.rs
index c8fc24dd..2859a43f 100644
--- a/src/memory/area_frame_allocator.rs
+++ b/src/memory/area_frame_allocator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/mod.rs b/src/memory/mod.rs
index 199471e3..266aa5a2 100644
--- a/src/memory/mod.rs
+++ b/src/memory/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/paging/entry.rs b/src/memory/paging/entry.rs
index 1128bd4d..5a34e273 100644
--- a/src/memory/paging/entry.rs
+++ b/src/memory/paging/entry.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/paging/mapper.rs b/src/memory/paging/mapper.rs
index 96f9e405..742a0da5 100644
--- a/src/memory/paging/mapper.rs
+++ b/src/memory/paging/mapper.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/paging/mod.rs b/src/memory/paging/mod.rs
index 43fab853..c8e27c34 100644
--- a/src/memory/paging/mod.rs
+++ b/src/memory/paging/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/paging/table.rs b/src/memory/paging/table.rs
index 38405dcf..5dd94e9d 100644
--- a/src/memory/paging/table.rs
+++ b/src/memory/paging/table.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/memory/paging/temporary_page.rs b/src/memory/paging/temporary_page.rs
index dac447f1..0934576e 100644
--- a/src/memory/paging/temporary_page.rs
+++ b/src/memory/paging/temporary_page.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
diff --git a/src/vga_buffer.rs b/src/vga_buffer.rs
index 2b4499da..76da8cbf 100644
--- a/src/vga_buffer.rs
+++ b/src/vga_buffer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 Philipp Oppermann. See the README.md
+// Copyright 2016 Philipp Oppermann. See the README.md
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or