diff --git a/modules/spotify/config.json b/modules/spotify/config.json
new file mode 100644
index 0000000..a051064
--- /dev/null
+++ b/modules/spotify/config.json
@@ -0,0 +1,4 @@
+{
+  "dependencies": [ "command" ],
+  "ignorable": true
+}
diff --git a/modules/spotify/spotify.js b/modules/spotify/spotify.js
new file mode 100644
index 0000000..a550241
--- /dev/null
+++ b/modules/spotify/spotify.js
@@ -0,0 +1,70 @@
+var request = require('request'),
+  _ = require('underscore')._;
+
+var spotify = function(dbot) {
+  /* examples:
+   * http://open.spotify.com/track/42SYMWISn7xUpTNPLw9V5E
+   * spotify:track:42SYMWISn7xUpTNPLw9V5E
+   * http://open.spotify.com/artist/3yY2gUcIsjMr8hjo51PoJ8
+   * spotify:artist:3yY2gUcIsjMr8hjo51PoJ8
+   * http://open.spotify.com/album/30g571JKoxs8AnsgAViV2J
+   * spotify:album:30g571JKoxs8AnsgAViV2J
+   */
+  this.spotifyRegex = /(\b(https?:\/\/open.spotify.com\/(artist|track|album)\/\w*|spotify:(artist|track|album):\w*)\b)/ig;
+  this.spotifyLookup = 'http://ws.spotify.com/lookup/1/.json';
+  this.spotifySearch = 'http://ws.spotify.com/search/1/track.json';
+
+  this.lookup = function(event, link) {
+    request({
+      url: this.spotifyLookup,
+      qs: {uri: link},
+      json: true
+    }, function(error, response, body) {
+      if (!error && response.statusCode == 200) {
+        var s = "\u00039spotify\u000f";
+        if (body.hasOwnProperty('track')) {
+          event.reply(dbot.t("track", {s: s, artist: _.map(body.track.artists, function(a) { return a.name }).join(', '), album: body.track.album.name, track: body.track.name}));
+        }
+        else if (body.hasOwnProperty('album')) {
+          event.reply(dbot.t("album", {s: s, artist: body.album.artist, album: body.album.name}));
+        }
+        else if (body.hasOwnProperty('artist')) {
+          event.reply(dbot.t("artist", {s: s, artist: body.artist.name}));
+        }
+      }
+    });
+  };
+
+  var commands = {
+    '~spotify': function(event) {
+      var query = event.input[1];
+      request({
+        url: this.spotifySearch,
+        qs: {q: query},
+        json: true
+      }, function(error, response, body) {
+        if (!error && response.statusCode == 200) {
+          if (body.hasOwnProperty('tracks')) {
+            var t = body.tracks[0].href;
+            t = t.replace(/:/g, '/');
+            t = t.replace(/spotify/, 'http://open.spotify.com');
+            event.reply(t);
+          }
+        }
+      });  
+    }
+  };
+  commands['~spotify'].regex = [/^~spotify (.*)/, 2];
+  this.listener = function(event) {
+    var spotifyMatches = event.message.match(this.spotifyRegex);
+    if (spotifyMatches != null) {
+      this.lookup(event, spotifyMatches[0]);
+    }
+  }.bind(this);
+  this.on = 'PRIVMSG';
+  this.commands = commands;
+};
+
+exports.fetch = function(dbot) {
+  return new spotify(dbot);
+};
diff --git a/modules/spotify/strings.json b/modules/spotify/strings.json
new file mode 100644
index 0000000..5deef8b
--- /dev/null
+++ b/modules/spotify/strings.json
@@ -0,0 +1,11 @@
+{
+  "artist": {
+    "english": "{s} [artist] {artist}"
+  },
+  "album": {
+    "english": "{s} [album] {artist} - {album}"
+  },
+  "track": {
+    "english": "{s} [track] {artist} - {track} (from {album})"
+  }
+}