diff --git a/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp b/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
index 956f4429f5..d5ad4c2fc0 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATAChannel::ATAChannel(device_node *node)
diff --git a/src/add-ons/kernel/bus_managers/ata/ATACommands.h b/src/add-ons/kernel/bus_managers/ata/ATACommands.h
index d5e620da52..0cfe44a435 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATACommands.h
+++ b/src/add-ons/kernel/bus_managers/ata/ATACommands.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_COMMANDS_H
 #define ATA_COMMANDS_H
 
diff --git a/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp b/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
index 73892464fe..fdc9eb0ff2 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATADevice.cpp
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 
diff --git a/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp b/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
index ba7be94553..462229a5bc 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp
@@ -1,5 +1,6 @@
 /*
- * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de.
  * Copyright 2002/03, Thomas Kurschel. All rights reserved.
  *
  * Distributed under the terms of the MIT License.
diff --git a/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp b/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
index 92b643be3b..1d8b5079b5 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATAModule.cpp
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 scsi_for_sim_interface *gSCSIModule = NULL;
diff --git a/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp b/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
index 6966024cce..6e0ba8d858 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATAPIDevice.cpp
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATAPIDevice::ATAPIDevice(ATAChannel *channel, uint8 index)
diff --git a/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h b/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
index 09ff88ac8c..ac3f1adecd 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
+++ b/src/add-ons/kernel/bus_managers/ata/ATAPrivate.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Copyright 2008, Marcus Overhagen.
+ * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2002-2003, Thomas Kurschel.
+ *
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_PRIVATE_H
 #define ATA_PRIVATE_H
 
diff --git a/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp b/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
index 21b6691f9a..35cffd4444 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
+++ b/src/add-ons/kernel/bus_managers/ata/ATARequest.cpp
@@ -1,3 +1,8 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Distributed under the terms of the MIT License.
+ */
+
 #include "ATAPrivate.h"
 
 ATARequest::ATARequest()
diff --git a/src/add-ons/kernel/bus_managers/ata/ATATracing.h b/src/add-ons/kernel/bus_managers/ata/ATATracing.h
index 6371ed03dd..9ea60cc382 100644
--- a/src/add-ons/kernel/bus_managers/ata/ATATracing.h
+++ b/src/add-ons/kernel/bus_managers/ata/ATATracing.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2009, Michael Lotz, mmlr@mlotz.ch.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef ATA_TRACING_H
 #define ATA_TRACING_H
 
diff --git a/src/add-ons/kernel/bus_managers/ata/Jamfile b/src/add-ons/kernel/bus_managers/ata/Jamfile
index 1b2bda095f..522eaf4fa7 100644
--- a/src/add-ons/kernel/bus_managers/ata/Jamfile
+++ b/src/add-ons/kernel/bus_managers/ata/Jamfile
@@ -20,3 +20,11 @@ KernelAddon ide :
 	virtual_memory.c
 	;
 
+KernelAddon ata :
+	ATAChannel.cpp
+	ATADevice.cpp
+	ATAHelper.cpp
+	ATAModule.cpp
+	ATAPIDevice.cpp
+	ATARequest.cpp
+	;
diff --git a/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h b/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
index eff7b4f5e7..3699c0dcd4 100644
--- a/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
+++ b/src/add-ons/kernel/bus_managers/ata/ata_device_infoblock.h
@@ -1,6 +1,6 @@
 /*
- * Copyright 2004-2006, Haiku, Inc. All RightsReserved.
- * Copyright 2002/03, Thomas Kurschel. All rights reserved.
+ * Copyright 2004-2009, Haiku, Inc.
+ * Copyright 2002/03, Thomas Kurschel.
  *
  * Distributed under the terms of the MIT License.
  */
@@ -16,7 +16,6 @@
 	have a rough time when you messed up the offsets.
 */
 
-
 #include <lendian_bitfield.h>
 
 #define ATA_GET_INFO_BLOCK	0x2710