diff --git a/.meteor/versions b/.meteor/versions
index 15562e4f1fe..937836621ce 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -142,7 +142,6 @@ rocketchat:oembed@0.0.1
 rocketchat:slashcommands-invite@0.0.1
 rocketchat:slashcommands-join@0.0.1
 rocketchat:slashcommands-leave@0.0.1
-rocketchat:soundcloud@0.0.1
 rocketchat:spotify@0.0.1
 rocketchat:statistics@0.0.1
 rocketchat:theme@0.0.1
diff --git a/packages/rocketchat-oembed/client/baseWidget.coffee b/packages/rocketchat-oembed/client/baseWidget.coffee
index 8a84ed7a506..9caa79832b0 100644
--- a/packages/rocketchat-oembed/client/baseWidget.coffee
+++ b/packages/rocketchat-oembed/client/baseWidget.coffee
@@ -15,4 +15,7 @@ Template.oembedBaseWidget.helpers
 		if this.parsedUrl?.host is 'www.youtube.com' and this.meta?.twitterPlayer?
 			return 'oembedYoutubeWidget'
 
+		if this.meta?.oembedHtml?
+			return 'oembedFrameWidget'
+
 		return 'oembedUrlWidget'
diff --git a/packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html b/packages/rocketchat-oembed/client/oembedFrameWidget.html
similarity index 67%
rename from packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html
rename to packages/rocketchat-oembed/client/oembedFrameWidget.html
index f478120bed7..6965b8e6102 100644
--- a/packages/rocketchat-soundcloud/lib/client/oembedSoundcloudWidget.html
+++ b/packages/rocketchat-oembed/client/oembedFrameWidget.html
@@ -1,7 +1,11 @@
-<template name="oembedSoundcloudWidget">
+<template name="oembedFrameWidget">
 	{{#if parsedUrl}}
 		<blockquote>
-			<a href="https://www.soundcloud.com" style="color: #9e9ea6">SoundCloud</a><br/>
+			{{#if meta.oembedProviderName}}
+				{{#if meta.oembedProviderUrl}}
+					<a href="{{meta.oembedProviderUrl}}" style="color: #9e9ea6">{{meta.oembedProviderName}}</a><br/>
+				{{/if}}
+			{{/if}}
 			{{#if meta.oembedAuthorName}}
 				{{#if meta.oembedAuthorUrl}}
 					<a href="meta.oembedAuthorUrl">{{meta.oembedAuthorName}}</a><br/>
diff --git a/packages/rocketchat-oembed/package.js b/packages/rocketchat-oembed/package.js
index eab59017ae9..ace7d0496be 100644
--- a/packages/rocketchat-oembed/package.js
+++ b/packages/rocketchat-oembed/package.js
@@ -11,6 +11,8 @@ Package.onUse(function(api) {
 	api.use([
 		'templating',
 		'coffeescript',
+		'underscore',
+		'konecty:change-case',
 		'rocketchat:lib@0.0.1'
 	]);
 
@@ -30,7 +32,10 @@ Package.onUse(function(api) {
 	api.addFiles('client/oembedUrlWidget.html', 'client');
 	api.addFiles('client/oembedUrlWidget.coffee', 'client');
 
+	api.addFiles('client/oembedFrameWidget.html', 'client');
+
 	api.addFiles('server/server.coffee', 'server');
+	api.addFiles('server/providers.coffee', 'server');
 	api.addFiles('server/models/OEmbedCache.coffee', 'server');
 
 	api.export('OEmbed', 'server');
diff --git a/packages/rocketchat-oembed/server/providers.coffee b/packages/rocketchat-oembed/server/providers.coffee
new file mode 100644
index 00000000000..b2b570e6f66
--- /dev/null
+++ b/packages/rocketchat-oembed/server/providers.coffee
@@ -0,0 +1,55 @@
+URL = Npm.require('url')
+
+class Providers
+	providers: []
+
+	@getConsumerUrl: (provider, url) ->
+		urlObj = URL.parse provider.endPoint, true
+		urlObj.query['url'] = url
+		delete urlObj.search
+		return URL.format urlObj
+
+	registerProvider: (provider) ->
+		this.providers.push(provider)
+
+	getProviders: () ->
+		return this.providers
+
+	getProviderForUrl: (url) ->
+		return _.find this.providers, (provider) ->
+			candidate = _.find provider.urls, (re) ->
+				return re.test url
+			return candidate?
+
+providers = new Providers()
+providers.registerProvider
+	urls: [new RegExp('https?://soundcloud.com/\\S+')]
+	endPoint: 'https://soundcloud.com/oembed?format=json&maxheight=150'
+
+RocketChat.oembed = {}
+RocketChat.oembed.providers = providers
+
+RocketChat.callbacks.add 'oembed:beforeGetUrlContent', (data) ->
+	if data.parsedUrl?
+		url = URL.format data.parsedUrl
+		provider = providers.getProviderForUrl url
+		if provider?
+			consumerUrl = Providers.getConsumerUrl provider, url
+			consumerUrl = URL.parse consumerUrl, true
+			_.extend data.parsedUrl, consumerUrl
+			data.requestOptions.port = consumerUrl.port
+			data.requestOptions.hostname = consumerUrl.hostname
+			data.requestOptions.path = consumerUrl.path
+
+RocketChat.callbacks.add 'oembed:afterParseContent', (data) ->
+	if data.parsedUrl?
+		url = URL.format data.parsedUrl
+		provider = providers.getProviderForUrl url
+		if provider?
+			if data.content?.body?
+				metas = JSON.parse data.content.body;
+				_.each metas, (value, key) ->
+					if _.isString value
+						data.meta[changeCase.camelCase('oembed_' + key)] = value
+			if data.parsedUrl?.query?.url?
+				data.meta['oembedUrl'] = data.parsedUrl.query.url
diff --git a/packages/rocketchat-soundcloud/lib/client/widget.coffee b/packages/rocketchat-soundcloud/lib/client/widget.coffee
deleted file mode 100644
index bf4c284024d..00000000000
--- a/packages/rocketchat-soundcloud/lib/client/widget.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-Template.oembedBaseWidget.onCreated () ->
-	if this.data?.parsedUrl?.host is 'soundcloud.com' and this.data?.meta?.oembedHtml?
-		this.data._overrideTemplate = 'oembedSoundcloudWidget'
diff --git a/packages/rocketchat-soundcloud/lib/server/server.coffee b/packages/rocketchat-soundcloud/lib/server/server.coffee
deleted file mode 100644
index b1bbe3be4eb..00000000000
--- a/packages/rocketchat-soundcloud/lib/server/server.coffee
+++ /dev/null
@@ -1,19 +0,0 @@
-URL = Npm.require('url')
-
-RocketChat.callbacks.add 'oembed:beforeGetUrlContent', (data) ->
-	if data.parsedUrl.host is 'soundcloud.com'
-		newUrlObj = URL.format data.parsedUrl
-		newUrlObj = URL.parse "https://soundcloud.com/oembed?url=" + encodeURIComponent newUrlObj + "&format=json&maxheight=150"
-		data.requestOptions.port = newUrlObj.port
-		data.requestOptions.hostname = newUrlObj.hostname
-		data.requestOptions.path = newUrlObj.path
-
-RocketChat.callbacks.add 'oembed:afterParseContent', (data) ->
-	if data.parsedUrl.host is 'soundcloud.com'
-		if data.content?.body?
-			metas = JSON.parse data.content.body;
-			_.each metas, (value, key) ->
-				if _.isString value
-					data.meta[changeCase.camelCase('oembed_' + key)] = value
-		if data.parsedUrl?
-			data.meta['oembedUrl'] = URL.format data.parsedUrl
diff --git a/packages/rocketchat-soundcloud/package.js b/packages/rocketchat-soundcloud/package.js
deleted file mode 100644
index 054b7802923..00000000000
--- a/packages/rocketchat-soundcloud/package.js
+++ /dev/null
@@ -1,28 +0,0 @@
-Package.describe({
-	name: 'rocketchat:soundcloud',
-	version: '0.0.1',
-	summary: 'Soundcloud integration',
-	git: ''
-});
-
-Package.onUse(function(api) {
-	api.versionsFrom('1.0');
-
-	api.use([
-		'coffeescript',
-		'templating',
-		'underscore',
-		'konecty:change-case',
-		'rocketchat:lib',
-		'rocketchat:oembed@0.0.1'
-	]);
-
-	api.addFiles('lib/client/widget.coffee', 'client');
-	api.addFiles('lib/client/oembedSoundcloudWidget.html', 'client');
-
-	api.addFiles('lib/server/server.coffee', 'server');
-});
-
-Package.onTest(function(api) {
-
-});