diff --git a/controllers/UploadMedia.php b/controllers/UploadMedia.php
index 1457131e..571047ba 100644
--- a/controllers/UploadMedia.php
+++ b/controllers/UploadMedia.php
@@ -33,10 +33,14 @@ class UploadMedia extends HTMLController
 				if (empty($uploaded_file))
 					continue;
 
+				// DIY slug club.
+				$slug = $tag->slug . '/' . strtr($uploaded_file['name'], [' ' => '-', '--' => '-', '&' => 'and', '=>' => '', "'" => "", ":"=> "", '\\' => '-']);
+
 				$asset = Asset::createNew([
 					'filename_to_copy' => $uploaded_file['tmp_name'],
 					'preferred_filename' => $uploaded_file['name'],
 					'preferred_subdir' => $tag->slug,
+					'slug' => $slug,
 				]);
 
 				$new_ids[] = $asset->getId();