diff --git a/src/main/java/org/springframework/hateoas/Resource.java b/src/main/java/org/springframework/hateoas/Resource.java
index 773b54b7..57f35797 100644
--- a/src/main/java/org/springframework/hateoas/Resource.java
+++ b/src/main/java/org/springframework/hateoas/Resource.java
@@ -54,4 +54,37 @@ public class Resource<T> extends ResourceSupport {
 	public T getContent() {
 		return content;
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.ResourceSupport#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || !obj.getClass().equals(getClass())) {
+			return false;
+		}
+
+		Resource<?> that = (Resource<?>) obj;
+
+		boolean contentEqual = this.content == null ? that.content == null : this.content.equals(that.content);
+		return contentEqual ? super.equals(obj) : false;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.ResourceSupport#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int result = super.hashCode();
+		result += content == null ? 0 : 17 * content.hashCode();
+		return result;
+	}
 }
diff --git a/src/main/java/org/springframework/hateoas/Resources.java b/src/main/java/org/springframework/hateoas/Resources.java
index 68bb4b8f..e90ec5a3 100644
--- a/src/main/java/org/springframework/hateoas/Resources.java
+++ b/src/main/java/org/springframework/hateoas/Resources.java
@@ -95,4 +95,39 @@ public class Resources<T extends Resource<?>> extends ResourceSupport implements
 	public Iterator<T> iterator() {
 		return content.iterator();
 	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.ResourceSupport#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (obj == this) {
+			return true;
+		}
+
+		if (obj == null || !obj.getClass().equals(getClass())) {
+			return false;
+		}
+
+		Resources<?> that = (Resources<?>) obj;
+
+		boolean contentEqual = this.content == null ? that.content == null : this.content.equals(that.content);
+		return contentEqual ? super.equals(obj) : false;
+	}
+
+	/* 
+	 * (non-Javadoc)
+	 * @see org.springframework.hateoas.ResourceSupport#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int result = super.hashCode();
+		result += content == null ? 0 : 17 * content.hashCode();
+
+		return result;
+	}
+
 }
diff --git a/src/test/java/org/springframework/hateoas/ResourceUnitTest.java b/src/test/java/org/springframework/hateoas/ResourceUnitTest.java
new file mode 100644
index 00000000..25c5c560
--- /dev/null
+++ b/src/test/java/org/springframework/hateoas/ResourceUnitTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.hateoas;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link Resource}.
+ * 
+ * @author Oliver Gierke
+ */
+public class ResourceUnitTest {
+
+	@Test
+	public void equalsForSelfReference() {
+
+		Resource<String> resource = new Resource<String>("foo");
+		assertThat(resource, is(resource));
+	}
+
+	@Test
+	public void equalsWithEqualContent() {
+
+		Resource<String> left = new Resource<String>("foo");
+		Resource<String> right = new Resource<String>("foo");
+
+		assertThat(left, is(right));
+		assertThat(right, is(left));
+	}
+
+	@Test
+	public void notEqualForDifferentContent() {
+
+		Resource<String> left = new Resource<String>("foo");
+		Resource<String> right = new Resource<String>("bar");
+
+		assertThat(left, is(not(right)));
+		assertThat(right, is(not(left)));
+	}
+
+	@Test
+	public void notEqualForDifferentLinks() {
+
+		Resource<String> left = new Resource<String>("foo");
+		Resource<String> right = new Resource<String>("foo");
+		right.add(new Link("localhost"));
+
+		assertThat(left, is(not(right)));
+		assertThat(right, is(not(left)));
+	}
+}
diff --git a/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java b/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java
new file mode 100644
index 00000000..e79166c6
--- /dev/null
+++ b/src/test/java/org/springframework/hateoas/ResourcesUnitTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.hateoas;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link Resources}.
+ * 
+ * @author Oliver Gierke
+ */
+public class ResourcesUnitTest {
+
+	Set<Resource<String>> foo = Collections.singleton(new Resource<String>("foo"));
+	Set<Resource<String>> bar = Collections.singleton(new Resource<String>("bar"));
+
+	@Test
+	public void equalsForSelfReference() {
+
+		Resources<Resource<String>> resource = new Resources<Resource<String>>(foo);
+		assertThat(resource, is(resource));
+	}
+
+	@Test
+	public void equalsWithEqualContent() {
+
+		Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
+		Resources<Resource<String>> right = new Resources<Resource<String>>(foo);
+
+		assertThat(left, is(right));
+		assertThat(right, is(left));
+	}
+
+	@Test
+	public void notEqualForDifferentContent() {
+
+		Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
+		Resources<Resource<String>> right = new Resources<Resource<String>>(bar);
+
+		assertThat(left, is(not(right)));
+		assertThat(right, is(not(left)));
+	}
+
+	@Test
+	public void notEqualForDifferentLinks() {
+
+		Resources<Resource<String>> left = new Resources<Resource<String>>(foo);
+		Resources<Resource<String>> right = new Resources<Resource<String>>(bar);
+		right.add(new Link("localhost"));
+
+		assertThat(left, is(not(right)));
+		assertThat(right, is(not(left)));
+	}
+}