diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
index b1d62ee4a4..21fa805f87 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016 the AndroidAnnotations project
  *
  * 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
@@ -231,6 +232,10 @@ public class ActivityWithServices extends Activity {
 	// @SystemService
 	// SipManager sipManager; // hidden API
 
+	// TODO API 25
+	// @SystemService
+	// ShortcutManager shortcutManager;
+
 	// @SystemService
 	// StatusBarManager statusBarManager; // hidden API
 
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
index 452ba93fad..631dffb569 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ServiceInjectionTest.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016 the AndroidAnnotations project
  *
  * 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
@@ -89,6 +90,7 @@ public void servicesAreInjected() {
 		assertThat(activity.sensorManager).isNotNull();
 		// assertThat(activity.serialManager).isNotNull(); // hidden API
 		// assertThat(activity.sipManager).isNotNull(); // hidden API
+		// assertThat(activity.shortcutManager).isNotNull(); // TODO API 25
 		// assertThat(activity.statusBarManager).isNotNull(); // hidden API
 		assertThat(activity.storageManager).isNotNull();
 		// assertThat(activity.subscriptionManager).isNotNull(); // TODO API 22
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
index de7b3fe998..538a5965e6 100644
--- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
+++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/model/AndroidSystemServices.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2016 eBusiness Information, Excilys Group
+ * Copyright (C) 2016 the AndroidAnnotations project
  *
  * 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
@@ -84,6 +85,7 @@ public AndroidSystemServices(AndroidAnnotationsEnvironment environment) {
 		registeredServices.put("android.hardware.SerialManager", "android.content.Context.SERIAL_SERVICE");
 		registeredServices.put("android.hardware.SensorManager", "android.content.Context.SENSOR_SERVICE");
 		registeredServices.put("android.net.sip.SipManager", "android.content.Context.SIP_SERVICE");
+		registeredServices.put("android.content.pm.ShortcutManager", "android.content.Context.SHORTCUT_SERVICE");
 		registeredServices.put("android.app.StatusBarManager", "android.content.Context.STATUS_BAR_SERVICE");
 		registeredServices.put("android.os.storage.StorageManager", "android.content.Context.STORAGE_SERVICE");
 		registeredServices.put("android.telephony.SubscriptionManager", "android.content.Context.TELEPHONY_SUBSCRIPTION_SERVICE");