diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index dd4a91d91e..b6fbcc1c5b 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -1287,6 +1287,7 @@ if $(HAIKU_NO_WERROR) != 1 {
 	EnableWerror src add-ons kernel file_systems layers ;
 	EnableWerror src add-ons kernel file_systems netfs ;
 	EnableWerror src add-ons kernel file_systems nfs ;
+	EnableWerror src add-ons kernel file_systems nfs4 ;
 #	EnableWerror src add-ons kernel file_systems ntfs ;
 	EnableWerror src add-ons kernel file_systems packagefs ;
 	EnableWerror src add-ons kernel file_systems ramfs ;
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index ffc8d7ea74..0f44294dcd 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -194,7 +194,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
 SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
 	$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
-SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs
+SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs nfs4
 	attribute_overlay write_overlay ntfs reiserfs udf googlefs ;
 
 # wifi firmware
diff --git a/src/add-ons/kernel/file_systems/Jamfile b/src/add-ons/kernel/file_systems/Jamfile
index 24fe5eb6a1..25bb03651a 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -11,6 +11,7 @@ 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 netfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems nfs4 ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems ntfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems packagefs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems ramfs ;
diff --git a/src/add-ons/kernel/file_systems/nfs4/Jamfile b/src/add-ons/kernel/file_systems/nfs4/Jamfile
new file mode 100644
index 0000000000..573415bf6b
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/nfs4/Jamfile
@@ -0,0 +1,7 @@
+SubDir HAIKU_TOP src add-ons kernel file_systems nfs4 ;
+
+UsePrivateHeaders kernel ;
+
+KernelAddon nfs4 :
+	kernel_interface.cpp
+;
diff --git a/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp
new file mode 100644
index 0000000000..e76a4b7375
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2012 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Paweł Dziepak, pdziepak@quarnos.org
+ */
+
+
+#include <fs_interface.h>
+
+
+extern fs_volume_ops gNFSv4VolumeOps;
+extern fs_vnode_ops gNFSv4VnodeOps;
+
+extern "C" void
+dprintf(const char* format, ...);
+
+
+static status_t
+nfs4_mount(fs_volume* volume, const char* device, uint32 flags,
+			const char* args, ino_t* _rootVnodeID)
+{
+	dprintf("NFS4 Mounting...\n");
+
+	volume->ops = &gNFSv4VolumeOps;
+
+	status_t error = publish_vnode(volume, 0, (void*)0xdeadbeef,
+									&gNFSv4VnodeOps, S_IFDIR, 0);
+	if (error != B_OK)
+		return error;
+
+	*_rootVnodeID = 0;
+
+	dprintf("NFS4 Mounted\n");
+
+	return B_OK;
+}
+
+
+static status_t
+nfs4_unmount(fs_volume* volume)
+{
+	dprintf("NFS4 Unmounting...\n");
+	return B_OK;
+}
+
+
+static status_t
+nfs4_put_vnode(fs_volume* volume, fs_vnode* vnode, bool reenter)
+{
+	return B_OK;
+}
+
+
+static status_t
+nfs4_std_ops(int32 op, ...)
+{
+	switch (op) {
+		case B_MODULE_INIT:
+			dprintf("NFS4 Init\n");
+			return B_OK;
+
+		case B_MODULE_UNINIT:
+			dprintf("NFS4 Uninit\n");
+			return B_OK;
+
+		default:
+			return B_ERROR;
+	}
+}
+
+
+fs_volume_ops gNFSv4VolumeOps = {
+	&nfs4_unmount
+};
+
+fs_vnode_ops gNFSv4VnodeOps = {
+	NULL,	// lookup()
+	NULL,	// get_vnode_name()
+	&nfs4_put_vnode
+};
+
+static file_system_module_info sNFSv4ModuleInfo = {
+	{
+		"file_systems/nfs4" B_CURRENT_FS_API_VERSION,
+		0,
+		nfs4_std_ops,
+	},
+
+	"nfs4",								// short_name
+	"Network File System version 4",	// pretty_name
+
+	// DDM flags
+	0,
+
+	// scanning
+	NULL,	// identify_partition()
+	NULL,	// scan_partition()
+	NULL,	// free_identify_partition_cookie()
+	NULL,	// free_partition_content_cookie()
+
+	&nfs4_mount,
+};
+
+module_info* modules[] = {
+	(module_info* )&sNFSv4ModuleInfo,
+	NULL,
+};
+