diff --git a/src/add-ons/kernel/file_systems/Jamfile b/src/add-ons/kernel/file_systems/Jamfile
index 85311738da..58d8c038aa 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -7,6 +7,7 @@ SubInclude HAIKU_TOP src add-ons kernel file_systems fat ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems overlay ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems udf ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems userlandfs ;
diff --git a/src/add-ons/kernel/file_systems/overlay/Jamfile b/src/add-ons/kernel/file_systems/overlay/Jamfile
new file mode 100644
index 0000000000..03d6eef089
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/overlay/Jamfile
@@ -0,0 +1,7 @@
+SubDir HAIKU_TOP src add-ons kernel file_systems overlay ;
+
+UsePrivateKernelHeaders ;
+
+KernelAddon overlay :
+	overlay.cpp
+	;
diff --git a/src/system/kernel/fs/overlay.cpp b/src/add-ons/kernel/file_systems/overlay/overlay.cpp
similarity index 95%
rename from src/system/kernel/fs/overlay.cpp
rename to src/add-ons/kernel/file_systems/overlay/overlay.cpp
index 932618995a..c29970cc77 100644
--- a/src/system/kernel/fs/overlay.cpp
+++ b/src/add-ons/kernel/file_systems/overlay/overlay.cpp
@@ -477,7 +477,7 @@ AttributeEntry::ReadStat(struct stat *stat)
 }
 
 
-//	#pragma mark - VNode ops
+//	#pragma mark - vnode ops
 
 
 #define OVERLAY_CALL(op, params...) \
@@ -1090,7 +1090,7 @@ static fs_vnode_ops sOverlayVnodeOps = {
 };
 
 
-//	#pragma mark - Volume Ops
+//	#pragma mark - volume ops
 
 
 #define OVERLAY_VOLUME_CALL(op, params...) \
@@ -1344,19 +1344,80 @@ static fs_volume_ops sOverlayVolumeOps = {
 	&overlay_delete_sub_vnode
 };
 
-}	// namespace _overlay
 
-using namespace overlay;
+//	#pragma mark - filesystem module
 
 
-// #pragma mark -
-
-
-status_t
-mount_overlay(fs_volume *volume, const char *device, uint32 flags,
+static status_t
+overlay_mount(fs_volume *volume, const char *device, uint32 flags,
 	const char *args, ino_t *rootID)
 {
 	TRACE_VOLUME("mounting overlay\n");
 	volume->ops = &sOverlayVolumeOps;
 	return B_OK;
 }
+
+
+static status_t
+overlay_std_ops(int32 op, ...)
+{
+	switch (op) {
+		case B_MODULE_INIT:
+		case B_MODULE_UNINIT:
+			return B_OK;
+		default:
+			return B_ERROR;
+	}
+}
+
+
+static file_system_module_info sOverlayFileSystem = {
+	{
+		"file_systems/overlay"B_CURRENT_FS_API_VERSION,
+		0,
+		overlay_std_ops,
+	},
+
+	"overlay",					// short_name
+	"Overlay File System",		// pretty_name
+	0,							// DDM flags
+
+	// scanning
+	NULL, // identify_partition
+	NULL, // scan_partition
+	NULL, // free_identify_partition_cookie
+	NULL, // free_partition_content_cookie
+
+	// general operations
+	&overlay_mount,
+
+	// capability querying
+	NULL, // get_supported_operations
+
+	NULL, // validate_resize
+	NULL, // validate_move
+	NULL, // validate_set_content_name
+	NULL, // validate_set_content_parameters
+	NULL, // validate_initialize
+
+	// shadow partition modification
+	NULL, // shadow_changed
+
+	// writing
+	NULL, // defragment
+	NULL, // repair
+	NULL, // resize
+	NULL, // move
+	NULL, // set_content_name
+	NULL, // set_content_parameters
+	NULL // initialize
+};
+
+}	// namespace _overlay
+
+using namespace overlay;
+
+module_info *modules[] = {
+	(module_info *)&sOverlayFileSystem,
+	NULL,
+};
diff --git a/src/system/kernel/fs/Jamfile b/src/system/kernel/fs/Jamfile
index 7b8f2411ac..6cb6fa7a4f 100644
--- a/src/system/kernel/fs/Jamfile
+++ b/src/system/kernel/fs/Jamfile
@@ -12,7 +12,6 @@ KernelMergeObject kernel_fs.o :
 	fifo.cpp
 	KPath.cpp
 	node_monitor.cpp
-	overlay.cpp
 	rootfs.cpp
 	socket.cpp
 	vfs.cpp
diff --git a/src/system/kernel/fs/overlay.h b/src/system/kernel/fs/overlay.h
deleted file mode 100644
index b05a0f1b0f..0000000000
--- a/src/system/kernel/fs/overlay.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2009, Haiku Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Michael Lotz <mmlr@mlotz.ch>
- */
-
-#ifndef _VFS_OVERLAY_H
-#define _VFS_OVERLAY_H
-
-#include <fs_interface.h>
-
-status_t	mount_overlay(fs_volume *volume, const char *device, uint32 flags,
-				const char *args, ino_t *rootID);
-
-#endif	// _VFS_OVERLAY_H