diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java
index 1de287c1..2aaaeca1 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java
@@ -52,9 +52,11 @@ public @interface FeignClient {
 	 * @deprecated use {@link #name() name} instead
 	 */
 	@Deprecated
-	@AliasFor("value")
 	String serviceId() default "";
 
+	/**
+	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
+	 */
 	@AliasFor("value")
 	String name() default "";
 
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/beans/FeignClientTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/beans/FeignClientTests.java
index 6fccf651..d3f85261 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/beans/FeignClientTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/beans/FeignClientTests.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.netflix.feign.beans;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
+import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +29,8 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.WebIntegrationTest;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -60,6 +63,9 @@ public class FeignClientTests {
 	@Autowired
 	private TestClient testClient;
 
+	@Autowired
+	private ApplicationContext context;
+
 	@Autowired
 	private org.springframework.cloud.netflix.feign.beans.extra.TestClient extraClient;
 
@@ -89,6 +95,14 @@ public class FeignClientTests {
 		private String message;
 	}
 
+	@Test
+	public void testAnnnotations() throws Exception {
+		Map<String, Object> beans = this.context
+				.getBeansWithAnnotation(FeignClient.class);
+		assertTrue("Wrong clients: " + beans,
+				beans.containsKey(TestClient.class.getName()));
+	}
+
 	@Test
 	public void testClient() {
 		assertNotNull("testClient was null", this.testClient);