diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.h b/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.h
new file mode 100644
index 0000000000..c803eda17a
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/beos/beos_kernel_emu.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef USERLAND_FS_BEOS_KERNEL_EMU_H
+#define USERLAND_FS_BEOS_KERNEL_EMU_H
+
+#include "FSCapabilities.h"
+
+
+// Implemented in BeOSKernelFileSystem. We can't use BeOSKernelFileSystem
+// directly in beos_kernel_emu.cpp, since BeOS and Haiku headers would clash.
+void get_beos_file_system_node_capabilities(FSVNodeCapabilities& capabilities);
+
+
+#endif	// USERLAND_FS_BEOS_KERNEL_EMU_H
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelNode.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelNode.cpp
new file mode 100644
index 0000000000..071bd1d509
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelNode.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include "HaikuKernelNode.h"
+
+#include "HaikuKernelFileSystem.h"
+
+
+HaikuKernelNode::~HaikuKernelNode()
+{
+	if (capabilities != NULL) {
+		HaikuKernelFileSystem* fileSystem
+			= static_cast<HaikuKernelFileSystem*>(FileSystem::GetInstance());
+		fileSystem->PutNodeCapabilities(capabilities);
+	}
+}