diff --git a/config/ponyfm.php b/config/ponyfm.php
index 1203dd76..add3e98f 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -40,4 +40,18 @@ return [
 
     'google_analytics_id' => env('GOOGLE_ANALYTICS_ID', null),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Show "Powered by Pony.fm" footer?
+    |--------------------------------------------------------------------------
+    |
+    | If true, a "Powered by Pony.fm" footer is used to comply with the
+    | license's attribution requirement. This should only be disabled on
+    | the official Pony.fm website, since that already shares its name with
+    | the open-source project.
+    |
+    */
+
+    'use_powered_by_footer' => env('USE_POWERED_BY_FOOTER', true),
+
 ];
diff --git a/resources/assets/styles/layout.less b/resources/assets/styles/layout.less
index 110b1383..77990e01 100644
--- a/resources/assets/styles/layout.less
+++ b/resources/assets/styles/layout.less
@@ -122,13 +122,13 @@ header {
 	  }
 	}
 
-    &.x-poniverseCredit {
+    &.x-attribution {
       position: absolute;
       bottom: 0;
       max-width: 100%;
       margin: 0;
       padding: 0;
-      text-align: center;
+      text-align: right;
 
       a {
         padding: 10px;
diff --git a/resources/environments/.env.example b/resources/environments/.env.example
index 3e28b6b7..663e44a8 100644
--- a/resources/environments/.env.example
+++ b/resources/environments/.env.example
@@ -1,6 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
-APP_URL=http://pony.fm.local/
+APP_URL=http://ponyfm-dev.poni/
 APP_KEY=SomeRandomString
 
 DB_HOST=localhost
diff --git a/resources/environments/.env.local b/resources/environments/.env.local
index 4b58c75c..5503e87a 100644
--- a/resources/environments/.env.local
+++ b/resources/environments/.env.local
@@ -1,6 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
-APP_URL=http://pony.fm.local/
+APP_URL=http://ponyfm-dev.poni/
 APP_KEY=q5lKAapzJwZas0izFS1CfCn3oX8Kk2jj
 
 DB_HOST=localhost
@@ -18,9 +18,9 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
-PONI_CLIENT_ID=
-PONI_CLIENT_SECRET=
+PONI_CLIENT_ID=null
+PONI_CLIENT_SECRET=null
 
 PONYFM_DATASTORE=/vagrant-files
 
-GOOGLE_ANALYTICS_ID=UA-29463256-1
+GOOGLE_ANALYTICS_ID=null
diff --git a/resources/environments/.env.production b/resources/environments/.env.production
index 49e132d8..2d9a778d 100644
Binary files a/resources/environments/.env.production and b/resources/environments/.env.production differ
diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage
index 7f820962..16462355 100644
Binary files a/resources/environments/.env.stage and b/resources/environments/.env.stage differ
diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index cb769311..22904a48 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -81,10 +81,15 @@
 				<li><a href="/login" target="_self">Login</a></li>
 				<li><a href="/register" target="_self">Register</a></li>
 			@endif
-            <li class="x-poniverseCredit">
-                <a ng-click="showCredits()" href="#" title="Poniverse: The Pony Supercommunity">
-                    <span>A community project by</span>
-                    <img src="/images/poniverse.svg" alt="Poniverse logo"/>
+            <li class="x-attribution">
+                <a ng-click="showCredits()" href="#" title="Pony.fm project credits">
+                    @if(config('ponyfm.use_powered_by_footer'))
+                        <span>Powered by</span>
+                        <img src="/images/fm_logo_white.svg" alt="Pony.fm logo"/>
+                    @else
+                        <span>A community project by</span>
+                        <img src="/images/poniverse.svg" alt="Poniverse logo"/>
+                    @endif
                 </a>
             </li>
 		</ul>