diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..f6bb5b1d1
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,24 @@
+* Mark Holmquist <mtraceur@member.fsf.org>
+* Gilles Dubuc <gdubuc@wikimedia.org>
+* Gergő Tisza <tgr.huwiki@gmail.com>
+* Aaron Arcos <aarcos.wiki@gmail.com>
+* Zeljko Filipin <zeljko.filipin@gmail.com>
+* Pau Giner <pau.giner@gmail.com>
+* theopolisme <theopolismewiki@gmail.com>
+* MatmaRex <matma.rex@gmail.com>
+* apsdehal <amanpreet.iitr2013@gmail.com>
+* vldandrew <vldandrew@gmail.com>
+* Ebrahim Byagowi <ebrahim@gnu.org>
+* Dereckson <dereckson@espace-win.org>
+* Brion VIBBER <brion@wikimedia.org>
+* Yuki Shira <shirayuking@gmail.com>
+* Yaroslav Melnychuk <yaroslavmelnuchuk@gmail.com>
+* tonythomas01 <01tonythomas@gmail.com>
+* raymond <raimond.spekking@gmail.com>
+* Kunal Mehta <legoktm@gmail.com>
+* Jeff Hall <jhall@wikimedia.org>
+* Christian Aistleitner <christian@quelltextlich.at>
+* Amir E. Aharoni <amir.aharoni@mail.huji.ac.il>
+
+Generated with git log --format='%aN <%aE>' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn | cut -d\  -f2-
+Manually pruned for bots and duplicates
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 85eee14b4..ca9d0af26 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -559,13 +559,33 @@ call_user_func( function() {
 	$wgHooks['ResourceLoaderGetConfigVars'][] = 'MultimediaViewerHooks::resourceLoaderGetConfigVars';
 	$wgHooks['ResourceLoaderTestModules'][] = 'MultimediaViewerHooks::getTestModules';
 
-	$wgExtensionCredits['other'][] = array(
+	$wgExtensionCredits['betafeatures'][] = array(
 		'path' => __FILE__,
 		'name' => 'MultimediaViewer',
 		'descriptionmsg' => 'multimediaviewer-desc',
 		'version' => '0.2.0',
 		'author' => array(
 			'MarkTraceur (Mark Holmquist)',
+			'Gilles Dubuc',
+			'Gergő Tisza',
+			'Aaron Arcos',
+			'Zeljko Filipin',
+			'Pau Giner',
+			'theopolisme',
+			'MatmaRex',
+			'apsdehal',
+			'vldandrew',
+			'Ebrahim Byagowi',
+			'Dereckson',
+			'Brion VIBBER',
+			'Yuki Shira',
+			'Yaroslav Melnychuk',
+			'tonythomas01',
+			'Raimond Spekking',
+			'Kunal Mehta',
+			'Jeff Hall',
+			'Christian Aistleitner',
+			'Amir E. Aharoni',
 		),
 		'url' => 'https://mediawiki.org/wiki/Extension:MultimediaViewer',
 	);