diff --git a/js/contentscript.js b/js/contentscript.js
index 9412c8f..991104e 100644
--- a/js/contentscript.js
+++ b/js/contentscript.js
@@ -98,7 +98,7 @@ GoogleMusicParser.prototype._get_song_title = function() {
  * @return Song artist
  */
 GoogleMusicParser.prototype._get_song_artist = function() {
-    return $("#playerArtist div").text();
+    return $("#player-artist div").text();
 };
 
 /**
diff --git a/manifest.json b/manifest.json
index 3059567..2a768be 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,8 +4,11 @@
       "http://play.google.com/",
       "https://play.google.com/"
    ],
-   "version" : "1.2.4",
-   "background_page" : "background.html",
+   "version" : "1.2.5",
+   "manifest_version" : 2,
+   "background" : {
+       "page": "background.html"
+   },
    "name" : "Last.fm scrobbler for Google Play",
    "icons" : {
       "128" : "img/icon128.png",
@@ -15,7 +18,7 @@
    },
    "description" : "Scrobbles songs from Google Music Player to Last.fm",
    "browser_action" : {
-      "popup" : "popup.html",
+      "default_popup" : "popup.html",
       "default_icon" : "img/main-icon.png"
    },
    "content_scripts" : [