diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ba05e30f..8a09bf5aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ####Next Version
 * Pebble: Support launching of Watchapps though the AppManager Activity
 * Pebble: Fix firmware installation when all 8 app slots are in use (and probably firmware installation form recovery)
+* Pebble: Support CM 12.1 Music App
 * Mi Band: Make vibration count configurable for different kinds of Notifications
 * Support rebooting Mi Band/Pebble through the Debug Activity
 
diff --git a/README.md b/README.md
index c3058b520..2832f2308 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ need to create an account and transmit any of your data to the vendor's servers.
 * SMS notification (sender, body)
 * K-9 Mail notification support (sender, subject, preview)
 * Support for generic notificaions (above filtered out)
-* Apollo playback info (artist, album, track)
+* Music playback info (artist, album, track). Apollo and CM 12.1 Music App supported.
 * Music control: play/pause, next track, previous track, volume up, volume down
 * List and remove installed apps/watchfaces
 * Install .pbw files
-* Install firmware from .pbz files (EXPERIMENTAL)
+* Install firmware from .pbz files
 
 ## How to use (Pebble)
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23b585664..5313245ea 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -136,6 +136,7 @@
             android:enabled="false" >
             <intent-filter>
                 <action android:name="com.andrew.apollo.metachanged" />
+                <action android:name="com.cyanogenmod.eleven.metachanged" />
             </intent-filter>
         </receiver>
         <receiver
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
index cc7eb457e..bed08aa13 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -75,6 +75,7 @@ public class NotificationListener extends NotificationListenerService {
                 source.equals("com.android.systemui") ||
                 source.equals("com.android.dialer") ||
                 source.equals("com.android.mms") ||
+                source.equals("com.cyanogenmod.eleven") ||
                 source.equals("com.fsck.k9")) {
             return;
         }