diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 907dc3e1..de7dc4b5 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -32,7 +32,7 @@ class DatabaseSeeder extends Seeder
     {
         Model::unguard();
 
-        // $this->call(UserTableSeeder::class);
+        $this->call(GenreTableSeeder::class);
 
         Model::reguard();
     }
diff --git a/database/seeds/GenreTableSeeder.php b/database/seeds/GenreTableSeeder.php
new file mode 100644
index 00000000..d860dadd
--- /dev/null
+++ b/database/seeds/GenreTableSeeder.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Pony.fm - A community for pony fan music.
+ * Copyright (C) 2015 Peter Deltchev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use Illuminate\Database\Seeder;
+
+class GenreTableSeeder extends Seeder {
+
+    public function run()
+    {
+        // This table only needs to be filled once.
+        if (DB::table('genres')->count() === 0) {
+            DB::table('genres')->insert(
+                [
+                    [
+                        'name' => 'Acoustic',
+                        'slug' => 'acoustic'
+                    ],
+
+                    [
+                        'name' => 'Adult Contemporary',
+                        'slug' => 'adult-contemporary'
+                    ],
+
+                    [
+                        'name' => 'Ambient',
+                        'slug' => 'ambient'
+                    ],
+
+                    [
+                        'name' => 'Chiptune',
+                        'slug' => 'chiptune'
+                    ],
+
+                    [
+                        'name' => 'Country',
+                        'slug' => 'country'
+                    ],
+
+                    [
+                        'name' => 'Darkwave',
+                        'slug' => 'darkwave'
+                    ],
+
+                    [
+                        'name' => 'Disco / Funk',
+                        'slug' => 'disco-funk'
+                    ],
+
+                    [
+                        'name' => 'Downtempo',
+                        'slug' => 'downtempo'
+                    ],
+
+                    [
+                        'name' => 'Drum & Bass',
+                        'slug' => 'drum-bass'
+                    ],
+
+                    [
+                        'name' => 'Dubstep',
+                        'slug' => 'dubstep'
+                    ],
+
+                    [
+                        'name' => 'EDM',
+                        'slug' => 'edm'
+                    ],
+
+                    [
+                        'name' => 'Electro',
+                        'slug' => 'electro'
+                    ],
+
+                    [
+                        'name' => 'Eurobeat',
+                        'slug' => 'eurobeat'
+                    ],
+
+                    [
+                        'name' => 'Experimental',
+                        'slug' => 'experimental'
+                    ],
+
+                    [
+                        'name' => 'Hardcore',
+                        'slug' => 'hardcore'
+                    ],
+
+                    [
+                        'name' => 'Hardstyle',
+                        'slug' => 'hardstyle'
+                    ],
+
+                    [
+                        'name' => 'Hip-Hop',
+                        'slug' => 'hip-hop'
+                    ],
+
+                    [
+                        'name' => 'House',
+                        'slug' => 'house'
+                    ],
+
+                    [
+                        'name' => 'IDM',
+                        'slug' => 'idm'
+                    ],
+
+                    [
+                        'name' => 'Jazz',
+                        'slug' => 'jazz'
+                    ],
+
+                    [
+                        'name' => 'Mashup',
+                        'slug' => 'mashup'
+                    ],
+
+                    [
+                        'name' => 'Metal',
+                        'slug' => 'metal'
+                    ],
+
+                    [
+                        'name' => 'Orchestral',
+                        'slug' => 'orchestral'
+                    ],
+
+                    [
+                        'name' => 'Other',
+                        'slug' => 'other'
+                    ],
+
+                    [
+                        'name' => 'Pop',
+                        'slug' => 'pop'
+                    ],
+
+                    [
+                        'name' => 'Progressive',
+                        'slug' => 'progressive'
+                    ],
+
+                    [
+                        'name' => 'Rock',
+                        'slug' => 'rock'
+                    ],
+
+                    [
+                        'name' => 'Ska / Punk',
+                        'slug' => 'ska-punk'
+                    ],
+
+                    [
+                        'name' => 'Synthpop',
+                        'slug' => 'synthpop'
+                    ],
+
+                    [
+                        'name' => 'Trance',
+                        'slug' => 'trance'
+                    ]
+                ]);
+            }
+    }
+
+}
diff --git a/vagrant/install.sh b/vagrant/install.sh
index a7a1b509..e106898c 100755
--- a/vagrant/install.sh
+++ b/vagrant/install.sh
@@ -31,7 +31,7 @@ cd /vagrant
 /usr/local/bin/composer self-update
 composer install
 
-cp "/vagrant/resources/environments/.env.local" "/vagrant/.env"
+cp -n "/vagrant/resources/environments/.env.local" "/vagrant/.env"
 
 php artisan migrate
 php artisan db:seed