diff --git a/composer.json b/composer.json
index fed982dc..40000d18 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
-    "license": "MIT",
+    "name": "poniverse/pony.fm",
+    "description": "The pony music hosting site.",
+    "keywords": ["music", "pony", "php", "laravel"],
+    "license": "Proprietary",
     "type": "project",
     "require": {
         "php": ">=5.5.9",
diff --git a/package.json b/package.json
index 275d9d85..ac9578cf 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "packages": {},
   "dependencies": {},
   "devDependencies": {
-    "gulp": "^3.8.11",
+    "gulp": "^3.9.0",
     "gulp-angular-templatecache": "^1.6.0",
     "gulp-autoprefixer": "^2.2.0",
     "gulp-cached": "^1.0.4",
diff --git a/public/templates/partials/credits-dialog.html b/public/templates/partials/credits-dialog.html
new file mode 100644
index 00000000..3c6ad2e4
--- /dev/null
+++ b/public/templates/partials/credits-dialog.html
@@ -0,0 +1,46 @@
+<div class="modal-header">
+	<h3>
+		<button type="button" class="close" ng-click="close()" ng-hide="isLoading">&times;</button>
+		Credits
+	</h3>
+</div>
+<div class="modal-body">
+  <p>Pony.fm was created to organize the <em>My Little Pony</em> community&#39;s fan music.
+  The project is maintained by <a href="https://poniverse.net/">Poniverse</a>, an
+    organization devoted to building and operating fan sites for the pony community.</p>
+
+	<h2>Open-source credits</h2>
+  <p>Pony.fm would not be possible without the efforts of the open-source community.
+  We thank the following projects, in no particular order, for providing the building
+  blocks for our own.</p>
+  <ul>
+    <li><a href="http://laravel.com/" target="_blank">Laravel</a> - our backend framework of choice</li>
+    <li><a href="https://angularjs.org/" target="_blank">Angular.js</a> - our front-end framework of choice</li>
+    <li><a href="https://secure.php.net/" target="_blank">PHP</a> - for providing a batteries-loaded language to build great web apps in</li>
+    <li><a href="https://getcomposer.org/" target="_blank">Composer</a> - for making the management of PHP dependencies sane</li>
+    <li><a href="https://ffmpeg.org/" target="_blank">FFmpeg</a> - for analyzing and dealing with every audio file we can throw at it</li>
+    <li><a href="http://guzzlephp.org/" target="_blank">Guzzle</a> - for adding sanity to the art of making HTTP requests</li>
+    <li><a href="https://github.com/CodeScaleInc/ffmpeg-php" target="_blank">FFmpegPHP</a> - for providing a sweet PHP interface to ffmpeg</li>
+    <li><a href="https://github.com/barryvdh/laravel-ide-helper" target="_blank">Laravel IDE Helper Generator</a> - for making our IDE useful</li>
+    <li><a href="https://github.com/In-Touch/laravel-newrelic" target="_blank">Laravel NewRelic Service Provider</a> - for making it easy to monitor Pony.fm&#39;'s performance</li>
+    <li><a href="https://www.vagrantup.com/" target="_blank">Vagrant</a> - for making cross-platform dev environments possible</li>
+    <li><a href="http://atomicparsley.sourceforge.net/" target="_blank">AtomicParsley</a> - for making it easy to work with tags in M4A files</li>
+    <li><a href="https://xiph.org/flac/" target="_blank">FLAC</a> - FLAC is best audio codec /)</li>
+    <li><a href="http://www.vorbis.com/" target="_blank">OGG Vorbis</a> - A great open-source audio codec</li>
+    <li><a href="http://www.audiocoding.com/faac.html" target="_blank">FAAC</a> - for encoding our AAC files</li>
+    <li><a href="http://lame.sourceforge.net/" target="_blank">LAME</a> - for encoding our MP3 files</li>
+    <li><a href="http://gulpjs.com/" target="_blank">gulp</a> - for being our asset pipeline</li>
+    <li><a href="https://nodejs.org/" target="_blank">Node.js</a> - for making JavaScript useful outside the browser</li>
+    <li><a href="http://www.schillmania.com/projects/soundmanager2/" target="_blank">SoundManager</a> - for smoothing out cross-browser audio playback</li>
+    <li><a href="http://momentjs.com/" target="_blank">Moment.js</a> - for making JavaScript dates sane</li>
+    <li><a href="http://getbootstrap.com/" target="_blank">Bootstrap</a> - for its front-end components and making layouts easy</li>
+    <li><a href="http://lesscss.org/" target="_blank">LESS</a> - for (almost) making CSS awesome</li>
+    <li><a href="https://jquery.com/" target="_blank">jQuery</a> - for being useful all over the place</li>
+    <li><a href="https://github.com/mgonto/angularytics" target="_blank">Angularytics</a> - for making Google Analytics useful in a single-page app</li>
+    <li><a href="https://github.com/angular-ui/ui-router" target="_blank">UI-Router</a> - for making non-trivial Angular.js routes possible</li>
+    <li><a href="https://angular-ui.github.io/bootstrap/" target="_blank">UI-Bootstrap</a> - for making Bootstrap and Angular.js get along</li>
+  </ul>
+</div>
+<div class="modal-footer">
+	<a class="btn cancel" ng-click="close()" ng-disabled="isLoading">Close</a>
+</div>
diff --git a/resources/assets/scripts/app/controllers/credits.coffee b/resources/assets/scripts/app/controllers/credits.coffee
new file mode 100644
index 00000000..11303d6c
--- /dev/null
+++ b/resources/assets/scripts/app/controllers/credits.coffee
@@ -0,0 +1,5 @@
+angular.module('ponyfm').controller "credits", [
+	'$scope', 'dialog',
+	($scope, dialog) ->
+		$scope.close = () -> dialog.close(null)
+]
diff --git a/resources/assets/scripts/app/controllers/sidebar.coffee b/resources/assets/scripts/app/controllers/sidebar.coffee
index 437e0f68..5cc2393d 100644
--- a/resources/assets/scripts/app/controllers/sidebar.coffee
+++ b/resources/assets/scripts/app/controllers/sidebar.coffee
@@ -38,4 +38,13 @@ angular.module('ponyfm').controller "sidebar", [
 			]).open().then (res) ->
 				return if res == 'cancel'
 				playlists.deletePlaylist playlist
-]
\ No newline at end of file
+
+
+		$scope.showCredits = () ->
+			dialog = $dialog.dialog
+				templateUrl: '/templates/partials/credits-dialog.html'
+				controller: 'credits'
+
+			dialog.open()
+
+]
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 6a620883..1f0287c5 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -82,7 +82,7 @@
 				<li><a href="/register" target="_self">Register</a></li>
 			@endif
             <li class="x-poniverseCredit">
-                <a href="https://poniverse.net/" title="Poniverse: The Pony Supercommunity" target="_blank">
+                <a ng-click="showCredits()" href="#" title="Poniverse: The Pony Supercommunity">
                     <span>A community project by</span>
                     <img src="/images/poniverse.svg" alt="Poniverse logo"/>
                 </a>