diff --git a/docs/user/app/Message.dox b/docs/user/app/Message.dox
index 21a16555a9..a3b0a3b746 100644
--- a/docs/user/app/Message.dox
+++ b/docs/user/app/Message.dox
@@ -1362,6 +1362,25 @@
 */
 
 
+/*!
+	\fn status_t BMessage::AddNodeRef(const char* name, const node_ref* ref)
+	\brief Convenience method to add a \c node_ref with the label \a name.
+
+	This method calls AddData() with the \c B_NODE_REF_TYPE \a type.
+
+	\param name The label to associate the data with.
+	\param ref The node reference to store in the message.
+
+	\returns A status code, \c B_OK on success or an error code.
+
+	\see AddData() for a more detailed overview of the inner workings.
+	\see FindNodeRef()
+	\see ReplaceNodeRef()
+
+	\since Haiku R1
+*/
+
+
 /*!
 	\fn status_t BMessage::AddMessage(const char* name,
 		const BMessage* message)
@@ -2433,6 +2452,49 @@
 */
 
 
+/*!
+	\fn status_t BMessage::FindNodeRef(const char* name, node_ref* ref) const
+	\brief Find a reference to a node at the label \a name.
+
+	This is an overloaded version of
+	FindNodeRef(const char*, int32, node_ref*) const
+	where the data is sought at \a index \c 0.
+
+	\param name The label to which the data is associated.
+	\param ref The object into which the data should be copied.
+
+	\returns A status code, \c B_OK on success or an error code.
+	\retval B_OK The object now contains the requested data.
+	\retval B_NAME_NOT_FOUND There is no field with this \a name.
+
+	\since Haiku R1
+*/
+
+
+/*!
+	\fn status_t BMessage::FindNodeRef(const char* name, int32 index,
+		node_ref* ref) const
+	\brief Find a reference to a node at the label \a name at an
+	       \a index.
+
+	This method looks for the data with the \c B_NODE_REF_TYPE, and copies
+	it into a provided buffer.
+
+	\param name The label to which the data is associated.
+	\param index The index from which the data should be copied.
+	\param ref The object in which the data should be copied.
+
+	\returns A status code, \c B_OK on success or an error code.
+	\retval B_OK The object now contains the requested data.
+	\retval B_BAD_INDEX The \a index does not exist.
+	\retval B_NAME_NOT_FOUND There is no field with this \a name.
+
+	\see FindNodeRef(const char*, node_ref*) const
+
+	\since Haiku R1
+*/
+
+
 /*!
 	\fn status_t BMessage::FindMessage(const char* name,
 		BMessage* message) const
@@ -3493,6 +3555,50 @@
 */
 
 
+/*!
+	\fn status_t BMessage::ReplaceNodeRef(const char* name,
+		const node_ref* ref)
+	\brief Replace a reference to a node at the label \a name.
+
+	This method is an overloaded method of
+	ReplaceNodeRef(const char*, int32, node_ref*).
+	It replaces the data at \a index \c 0.
+
+	\param name The name associated with the data to replace.
+	\param ref The object to store in the message.
+
+	\returns A status code, \c B_OK on success or an error code.
+	\retval B_OK The operation succeeded.
+	\retval B_NAME_NOT_FOUND There is no field with this \a name.
+
+	\since Haiku R1
+*/
+
+
+/*!
+	\fn status_t BMessage::ReplaceNodeRef(const char* name, int32 index,
+		const node_ref* ref)
+	\brief Replace a reference to a node at the label \a name at a
+		specified \a index.
+
+	The data at the specified \a name and \a index will be replaced, if it
+	matches the \c B_NODE_REF_TYPE.
+
+	\param name The name associated with the data to replace.
+	\param index The index in the array to replace.
+	\param ref The object to store in the message.
+
+	\returns A status code, \c B_OK on success or an error code.
+	\retval B_OK The operation succeeded.
+	\retval B_BAD_INDEX The index was out of range.
+	\retval B_NAME_NOT_FOUND There is no field with this \a name.
+
+	\see ReplaceNodeRef(const char*, node_ref*)
+
+	\since Haiku R1
+*/
+
+
 /*!
 	\fn status_t BMessage::ReplaceMessage(const char* name,
 		const BMessage* message)
@@ -3843,6 +3949,16 @@
 */
 
 
+/*!
+	\fn bool BMessage::HasNodeRef(const char*, int32) const
+	\brief Deprecated.
+
+	\warning This method is deprecated, do not use.
+
+	\since Haiku R1.
+*/
+
+
 /*!
 	\fn bool BMessage::HasMessage(const char*, int32) const
 	\brief Deprecated.
diff --git a/docs/user/support/TypeConstants.dox b/docs/user/support/TypeConstants.dox
index 2d776240da..2432360b65 100644
--- a/docs/user/support/TypeConstants.dox
+++ b/docs/user/support/TypeConstants.dox
@@ -220,6 +220,14 @@
 */
 
 
+/*!
+	\var B_NODE_REF_TYPE
+	\brief Represents a \c node_ref structure.
+
+	\since Haiku R1
+*/
+
+
 /*!
 	\var B_RGB_COLOR_TYPE
 	\brief Represents an \c rgb_color structure.
diff --git a/headers/os/app/Message.h b/headers/os/app/Message.h
index ab1e909efc..e21fddb0cc 100644
--- a/headers/os/app/Message.h
+++ b/headers/os/app/Message.h
@@ -13,8 +13,10 @@
 
 #include <BeBuild.h>
 #include <DataIO.h>
+#include <Entry.h>
 #include <Flattenable.h>
 #include <OS.h>
+#include <Node.h>
 #include <Rect.h>
 #include <Size.h>
 
@@ -161,6 +163,8 @@ public:
 			status_t			AddMessenger(const char* name,
 									BMessenger messenger);
 			status_t			AddRef(const char* name, const entry_ref* ref);
+			status_t			AddNodeRef(const char* name,
+									const node_ref* ref);
 			status_t			AddMessage(const char* name,
 									const BMessage* message);
 			status_t			AddFlat(const char* name, BFlattenable* object,
@@ -258,6 +262,10 @@ public:
 			status_t			FindRef(const char* name, entry_ref* ref) const;
 			status_t			FindRef(const char* name, int32 index,
 									entry_ref* ref) const;
+			status_t			FindNodeRef(const char* name,
+									node_ref* ref) const;
+			status_t			FindNodeRef(const char* name, int32 index,
+									node_ref* ref) const;
 			status_t			FindMessage(const char* name,
 									BMessage* message) const;
 			status_t			FindMessage(const char* name, int32 index,
@@ -346,6 +354,10 @@ public:
 									const entry_ref* ref);
 			status_t			ReplaceRef(const char* name, int32 index,
 									const entry_ref* ref);
+			status_t			ReplaceNodeRef(const char* name,
+									const node_ref* ref);
+			status_t			ReplaceNodeRef(const char* name, int32 index,
+									const node_ref* ref);
 			status_t			ReplaceMessage(const char* name,
 									const BMessage* message);
 			status_t			ReplaceMessage(const char* name, int32 index,
@@ -394,6 +406,7 @@ public:
 			bool				HasMessenger(const char* name,
 									int32 n = 0) const;
 			bool				HasRef(const char* name, int32 n = 0) const;
+			bool				HasNodeRef(const char* name, int32 n = 0) const;
 			bool				HasMessage(const char* name, int32 n = 0) const;
 			bool				HasFlat(const char* name,
 									const BFlattenable* object) const;
diff --git a/headers/os/support/TypeConstants.h b/headers/os/support/TypeConstants.h
index 33f8d202c6..a6f8f2b6b0 100644
--- a/headers/os/support/TypeConstants.h
+++ b/headers/os/support/TypeConstants.h
@@ -46,6 +46,7 @@ enum {
 	B_RAW_TYPE						= 'RAWT',
 	B_RECT_TYPE						= 'RECT',
 	B_REF_TYPE						= 'RREF',
+	B_NODE_REF_TYPE					= 'NREF',
 	B_RGB_32_BIT_TYPE				= 'RGBB',
 	B_RGB_COLOR_TYPE				= 'RGBC',
 	B_SIZE_TYPE						= 'SIZE',
diff --git a/headers/private/app/MessageUtils.h b/headers/private/app/MessageUtils.h
index 920f2fbeff..1a55604575 100644
--- a/headers/private/app/MessageUtils.h
+++ b/headers/private/app/MessageUtils.h
@@ -5,15 +5,22 @@
 #include <DataIO.h>
 #include <Entry.h>
 #include <Message.h>
+#include <Node.h>
 #include <SupportDefs.h>
 
 
 namespace BPrivate {	// Only putting these here because Be did
 
+// entry_ref
 status_t entry_ref_flatten(char* buffer, size_t* size, const entry_ref* ref);
 status_t entry_ref_unflatten(entry_ref* ref, const char* buffer, size_t size);
 status_t entry_ref_swap(char* buffer, size_t size);
 
+// node_ref
+status_t node_ref_flatten(char* buffer, size_t* size, const node_ref* ref);
+status_t node_ref_unflatten(node_ref* ref, const char* buffer, size_t size);
+status_t node_ref_swap(char* buffer, size_t size);
+
 uint32 CalculateChecksum(const uint8 *buffer, int32 size);
 
 }	// namespace BPrivate
diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index b4a411f34b..52307b784d 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -21,13 +21,11 @@
 #include <Application.h>
 #include <AppMisc.h>
 #include <BlockCache.h>
-#include <Entry.h>
 #include <GraphicsDefs.h>
 #include <MessageQueue.h>
 #include <Messenger.h>
 #include <Path.h>
 #include <Point.h>
-#include <Rect.h>
 #include <String.h>
 #include <StringList.h>
 
@@ -720,6 +718,16 @@ BMessage::_PrintToStream(const char* indent) const
 					break;
 				}
 
+				case B_NODE_REF_TYPE:
+				{
+					node_ref ref;
+					BPrivate::node_ref_unflatten(&ref, (char*)pointer, size);
+
+					printf("node_ref(device=%d, node=%" B_PRIdINO ", ",
+						(int)ref.device, ref.node);
+					break;
+				}
+
 				case B_MESSAGE_TYPE:
 				{
 					char buffer[1024];
@@ -2511,6 +2519,7 @@ DEFINE_HAS_FUNCTION(String, B_STRING_TYPE);
 DEFINE_HAS_FUNCTION(Pointer, B_POINTER_TYPE);
 DEFINE_HAS_FUNCTION(Messenger, B_MESSENGER_TYPE);
 DEFINE_HAS_FUNCTION(Ref, B_REF_TYPE);
+DEFINE_HAS_FUNCTION(NodeRef, B_NODE_REF_TYPE);
 DEFINE_HAS_FUNCTION(Message, B_MESSAGE_TYPE);
 
 #undef DEFINE_HAS_FUNCTION
@@ -2710,6 +2719,21 @@ BMessage::AddRef(const char* name, const entry_ref* ref)
 }
 
 
+status_t
+BMessage::AddNodeRef(const char* name, const node_ref* ref)
+{
+	size_t size = sizeof(node_ref);
+	char buffer[size];
+
+	status_t error = BPrivate::node_ref_flatten(buffer, &size, ref);
+
+	if (error >= B_OK)
+		error = AddData(name, B_NODE_REF_TYPE, buffer, size, false);
+
+	return error;
+}
+
+
 status_t
 BMessage::AddMessage(const char* name, const BMessage* message)
 {
@@ -2989,6 +3013,33 @@ BMessage::FindRef(const char* name, int32 index, entry_ref* ref) const
 }
 
 
+status_t
+BMessage::FindNodeRef(const char* name, node_ref* ref) const
+{
+	return FindNodeRef(name, 0, ref);
+}
+
+
+status_t
+BMessage::FindNodeRef(const char* name, int32 index, node_ref* ref) const
+{
+	if (ref == NULL)
+		return B_BAD_VALUE;
+
+	void* data = NULL;
+	ssize_t size = 0;
+	status_t error = FindData(name, B_NODE_REF_TYPE, index,
+		(const void**)&data, &size);
+
+	if (error == B_OK)
+		error = BPrivate::node_ref_unflatten(ref, (char*)data, size);
+	else
+		*ref = node_ref();
+
+	return error;
+}
+
+
 status_t
 BMessage::FindMessage(const char* name, BMessage* message) const
 {
@@ -3154,6 +3205,28 @@ BMessage::ReplaceRef(const char* name, int32 index, const entry_ref* ref)
 }
 
 
+status_t
+BMessage::ReplaceNodeRef(const char* name, const node_ref* ref)
+{
+	return ReplaceNodeRef(name, 0, ref);
+}
+
+
+status_t
+BMessage::ReplaceNodeRef(const char* name, int32 index, const node_ref* ref)
+{
+	size_t size = sizeof(node_ref) + B_PATH_NAME_LENGTH;
+	char buffer[size];
+
+	status_t error = BPrivate::node_ref_flatten(buffer, &size, ref);
+
+	if (error >= B_OK)
+		error = ReplaceData(name, B_NODE_REF_TYPE, index, buffer, size);
+
+	return error;
+}
+
+
 status_t
 BMessage::ReplaceMessage(const char* name, const BMessage* message)
 {
diff --git a/src/kits/app/MessageUtils.cpp b/src/kits/app/MessageUtils.cpp
index 47b612514b..52c6a71936 100644
--- a/src/kits/app/MessageUtils.cpp
+++ b/src/kits/app/MessageUtils.cpp
@@ -46,7 +46,7 @@ entry_ref_flatten(char *buffer, size_t *size, const entry_ref *ref)
 	memcpy((void *)buffer, (const void *)&ref->device, sizeof(ref->device));
 	buffer += sizeof(ref->device);
 	memcpy((void *)buffer, (const void *)&ref->directory, sizeof(ref->directory));
-	buffer += sizeof (ref->directory);
+	buffer += sizeof(ref->directory);
 	*size -= sizeof(ref->device) + sizeof(ref->directory);
 
 	size_t nameLength = 0;
@@ -59,6 +59,7 @@ entry_ref_flatten(char *buffer, size_t *size, const entry_ref *ref)
 	}
 
 	*size = sizeof(ref->device) + sizeof(ref->directory) + nameLength;
+
 	return B_OK;
 }
 
@@ -71,9 +72,10 @@ entry_ref_unflatten(entry_ref *ref, const char *buffer, size_t size)
 		return B_BAD_VALUE;
 	}
 
-	memcpy((void  *)&ref->device, (const void *)buffer, sizeof(ref->device));
-	buffer += sizeof (ref->device);
-	memcpy((void *)&ref->directory, (const void *)buffer, sizeof(ref->directory));
+	memcpy((void *)&ref->device, (const void *)buffer, sizeof(ref->device));
+	buffer += sizeof(ref->device);
+	memcpy((void *)&ref->directory, (const void *)buffer,
+		sizeof(ref->directory));
 	buffer += sizeof(ref->directory);
 
 	if (ref->device != ~(dev_t)0 && size > sizeof(ref->device)
@@ -106,4 +108,54 @@ entry_ref_swap(char *buffer, size_t size)
 	return B_OK;
 }
 
+
+/* node_ref support functions */
+status_t
+node_ref_flatten(char *buffer, size_t *size, const node_ref *ref)
+{
+	if (*size < sizeof(dev_t) + sizeof(ino_t))
+		return B_BUFFER_OVERFLOW;
+
+	memcpy((void *)buffer, (const void *)&ref->device, sizeof(ref->device));
+	buffer += sizeof(ref->device);
+	memcpy((void *)buffer, (const void *)&ref->node, sizeof(ref->node));
+	buffer += sizeof(ref->node);
+
+	return B_OK;
+}
+
+
+status_t
+node_ref_unflatten(node_ref *ref, const char *buffer, size_t size)
+{
+	if (size < sizeof(dev_t) + sizeof(ino_t)) {
+		*ref = node_ref();
+		return B_BAD_VALUE;
+	}
+
+	memcpy((void *)&ref->device, (const void *)buffer, sizeof(dev_t));
+	buffer += sizeof(dev_t);
+	memcpy((void *)&ref->node, (const void *)buffer, sizeof(ino_t));
+	buffer += sizeof(ino_t);
+
+	return B_OK;
+}
+
+
+status_t
+node_ref_swap(char *buffer, size_t size)
+{
+	if (size < sizeof(dev_t) + sizeof(ino_t))
+		return B_BAD_VALUE;
+
+	dev_t *dev = (dev_t *)buffer;
+	*dev = B_SWAP_INT32(*dev);
+	buffer += sizeof(dev_t);
+
+	ino_t *ino = (ino_t *)buffer;
+	*ino = B_SWAP_INT64(*ino);
+
+	return B_OK;
+}
+
 } // namespace BPrivate
diff --git a/src/kits/debugger/demangler/Demangler.cpp b/src/kits/debugger/demangler/Demangler.cpp
index 5ed8950641..7018b54d5e 100644
--- a/src/kits/debugger/demangler/Demangler.cpp
+++ b/src/kits/debugger/demangler/Demangler.cpp
@@ -94,6 +94,7 @@ Demangler::Demangle(const BString& mangledName)
 				demangledName << "void*";
 				break;
 			case B_REF_TYPE:
+			case B_NODE_REF_TYPE:
 				// TODO: use length as hint on reference type
 				demangledName << "&";
 				break;
diff --git a/src/kits/debugger/value/value_nodes/BMessageValueNode.cpp b/src/kits/debugger/value/value_nodes/BMessageValueNode.cpp
index 0129c26b9d..989a083185 100644
--- a/src/kits/debugger/value/value_nodes/BMessageValueNode.cpp
+++ b/src/kits/debugger/value/value_nodes/BMessageValueNode.cpp
@@ -478,6 +478,11 @@ BMessageValueNode::_GetTypeForTypeCode(TeamTypeInformation* info,
 			constraints.SetTypeKind(TYPE_COMPOUND);
 			break;
 
+		case B_NODE_REF_TYPE:
+			typeName = "node_ref";
+			constraints.SetTypeKind(TYPE_COMPOUND);
+			break;
+
 		case B_RGB_COLOR_TYPE:
 			typeName = "rgb_color";
 			constraints.SetTypeKind(TYPE_COMPOUND);
diff --git a/src/kits/support/ByteOrder.cpp b/src/kits/support/ByteOrder.cpp
index c009a5fe07..000a5d9b7a 100644
--- a/src/kits/support/ByteOrder.cpp
+++ b/src/kits/support/ByteOrder.cpp
@@ -143,6 +143,7 @@ is_type_swapped(type_code type)
 		case B_POINT_TYPE:
 		case B_RECT_TYPE:
 		case B_REF_TYPE:
+		case B_NODE_REF_TYPE:
 		case B_RGB_32_BIT_TYPE:
 		case B_RGB_COLOR_TYPE:
 		case B_SIZE_T_TYPE:
diff --git a/src/kits/tracker/infowindow/AttributesView.cpp b/src/kits/tracker/infowindow/AttributesView.cpp
index d19e8d9e0e..31774f4053 100644
--- a/src/kits/tracker/infowindow/AttributesView.cpp
+++ b/src/kits/tracker/infowindow/AttributesView.cpp
@@ -394,7 +394,11 @@ AttributesView::AttributesView(Model* model)
 					kTypeColumn);
 				break;
 			case B_REF_TYPE:
-				row->SetField(new BStringField(B_TRANSLATE("Reference")),
+				row->SetField(new BStringField(B_TRANSLATE("Entry ref")),
+					kTypeColumn);
+				break;
+			case B_NODE_REF_TYPE:
+				row->SetField(new BStringField(B_TRANSLATE("Node ref")),
 					kTypeColumn);
 				break;
 			case B_RGB_32_BIT_TYPE: