diff --git a/changelog.txt b/changelog.txt
index 8d01fffb7..4528c748f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,7 @@ Changes in version 1.0.0.RC1 (2011-04-04)
 * Neo4jTemplate API udpates
 * added aspect-introduced methods to NodeBacked and RelationshipBacked interfaces (with javadocs)
 * removed fullIndex annotation attribute
+* moved @Indexed annotation to org.springframework.data.graph.neo4j.annotation package
 * many documentation updates
 
 
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index 6e8351955..451a54d2f 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -6,7 +6,7 @@ Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
- org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.graph.neo4j.annotation.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.graph.*;version="0",
  org.neo4j.*;version="0",
  org.w3c.dom.*;version="0",
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/annotation/Indexed.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java
similarity index 97%
rename from spring-data-neo4j/src/main/java/org/springframework/data/annotation/Indexed.java
rename to spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java
index 64de3da58..0791ff463 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/annotation/Indexed.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/annotation/Indexed.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.data.annotation;
+package org.springframework.data.graph.neo4j.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
index 1671ca121..59df88f66 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java
@@ -21,9 +21,9 @@ import org.apache.commons.logging.LogFactory;
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.index.lucene.ValueContext;
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.annotation.NodeEntity;
 import org.springframework.data.graph.core.GraphBacked;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 import org.springframework.data.graph.neo4j.support.GraphDatabaseContext;
 
 import java.lang.reflect.AnnotatedElement;
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java
index 7f4f52ec1..e93e1ef30 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java
@@ -24,8 +24,8 @@ import org.neo4j.graphdb.index.IndexManager;
 import org.neo4j.index.impl.lucene.LuceneIndexImplementation;
 import org.neo4j.kernel.AbstractGraphDatabase;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.core.*;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 
 import javax.transaction.Status;
 import javax.transaction.SystemException;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java
index c42565845..b44beab42 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java
@@ -17,10 +17,10 @@
 package org.springframework.data.graph.neo4j;
 
 
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.annotation.EndNode;
 import org.springframework.data.graph.annotation.RelationshipEntity;
 import org.springframework.data.graph.annotation.StartNode;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 
 import java.util.Date;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java
index 5bbe86396..2e497294d 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java
@@ -20,7 +20,6 @@ import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.traversal.TraversalDescription;
 import org.neo4j.kernel.Traversal;
 import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl;
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.*;
 import org.springframework.data.graph.annotation.GraphProperty;
 import org.springframework.data.graph.annotation.GraphTraversal;
@@ -30,6 +29,8 @@ import org.springframework.data.graph.core.Direction;
 import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder;
 import org.springframework.data.graph.core.NodeBacked;
 import org.springframework.data.graph.neo4j.Person;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
+
 import static org.springframework.data.graph.neo4j.Person.persistedPerson;
 import static org.springframework.data.graph.neo4j.Person.persistedPerson;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java
index 8ed271615..426259f67 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java
@@ -16,12 +16,12 @@
 
 package org.springframework.data.graph.neo4j;
 
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.annotation.GraphId;
 import org.springframework.data.graph.annotation.NodeEntity;
 import org.springframework.data.graph.annotation.RelatedTo;
 import org.springframework.data.graph.annotation.RelatedToVia;
 import org.springframework.data.graph.core.Direction;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java
index 308a3cc5c..f3a06f8e5 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java
@@ -16,9 +16,9 @@
 
 package org.springframework.data.graph.neo4j.partial;
 
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.annotation.GraphProperty;
 import org.springframework.data.graph.annotation.NodeEntity;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 
 import javax.persistence.*;
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java
index f23ead73a..fb53fe5dd 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java
@@ -17,12 +17,12 @@
 package org.springframework.data.graph.neo4j.partial;
 
 import org.neo4j.graphdb.DynamicRelationshipType;
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.*;
 import org.springframework.data.graph.annotation.GraphProperty;
 import org.springframework.data.graph.annotation.NodeEntity;
 import org.springframework.data.graph.annotation.RelatedTo;
 import org.springframework.data.graph.annotation.RelatedToVia;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 
 import javax.persistence.*;
 import java.util.Set;
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java
index 2359261bc..61cabcdda 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java
@@ -29,11 +29,11 @@ import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.helpers.collection.IteratorUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.Indexed;
 import org.springframework.data.graph.annotation.NodeEntity;
 import org.springframework.data.graph.neo4j.Friendship;
 import org.springframework.data.graph.neo4j.Group;
 import org.springframework.data.graph.neo4j.Person;
+import org.springframework.data.graph.neo4j.annotation.Indexed;
 import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory;
 import org.springframework.data.graph.neo4j.repository.NodeGraphRepository;
 import org.springframework.data.graph.neo4j.repository.RelationshipGraphRepository;
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index c1f5e91e1..c7c6c6fb4 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -44,6 +44,7 @@
 			<includes>
 				<include>org.springframework.data:spring-data-graph-core</include>
 				<include>org.springframework.data:spring-data-neo4j</include>
+				<include>org.springframework.data:spring-data-neo4j-rest</include>
 			</includes>
 			<binaries>
 				<outputDirectory>dist</outputDirectory>
@@ -57,6 +58,7 @@
 			<includes>
 				<include>org.springframework.data:spring-data-graph-core</include>
 				<include>org.springframework.data:spring-data-neo4j</include>
+				<include>org.springframework.data:spring-data-neo4j-rest</include>
 			</includes>
 			<binaries>
 				<attachmentClassifier>sources</attachmentClassifier>