diff --git a/wp-admin/menu.txt b/wp-admin/menu.txt
index 08223ae028..00f4e46bae 100644
--- a/wp-admin/menu.txt
+++ b/wp-admin/menu.txt
@@ -4,6 +4,7 @@
 5	link-manager.php	Links
 3	users.php	Users
 4	options-general.php	Options
+8	plugins.php	Plugins
 4	templates.php	Templates
 5	upload.php	Upload
 0	profile.php	My Profile
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
new file mode 100644
index 0000000000..a85c7b85a4
--- /dev/null
+++ b/wp-admin/plugins.php
@@ -0,0 +1,88 @@
+<?php
+$title = 'Manage Plugins';
+
+require_once('admin-header.php');
+
+if ($user_level == 0) //Checks to see if user has logged in
+	die ("Cheatin' uh ?");
+
+?>
+<div class="wrap">
+<?php
+// Files in wp-content/plugins directory
+$plugins_dir = @ dir(ABSPATH . 'wp-content/plugins');
+if ($plugins_dir) {
+	while(($file = $plugins_dir->read()) !== false) {
+	  if (!preg_match('|^\.+$|', $file)) $plugin_files[] = $file;
+	}
+}
+
+if ('' != trim(get_settings('active_plugins'))) {
+	$current_plugins = unserialize(get_settings('active_plugins'));
+}
+
+/*
+Plugin Name: matt's cool plugin
+Plugin URI: http://photomatt.net/plugins/cool-plugin
+Description: blah blah blah anything until a newline
+Author: photo matt
+Author URI: http://photomatt.net
+*/ 
+
+if (!$plugins_dir || !$plugin_files) {
+	echo "<p>Couldn't open plugins directory or there are no plugins available.</p>"; // TODO: make more helpful
+} else {
+?>
+<table width="100%" cellpadding="3" cellspacing="3">
+	<tr>
+		<th>Plugin</th>
+		<th>Author</th>
+		<th>Description</th>
+		<th>Action</th>
+	</tr>
+<?php
+	sort($plugin_files); // Alphabetize by filename. Better way?
+	foreach($plugin_files as $plugin_file) {
+		$plugin_data = implode('', file(ABSPATH . '/wp-content/plugins/' . $plugin_file));
+		preg_match("|Plugin Name:(.*)|i", $plugin_data, $plugin_name);
+		preg_match("|Plugin URI:(.*)|i", $plugin_data, $plugin_uri);
+		preg_match("|Description:(.*)|i", $plugin_data, $description);
+		preg_match("|Author:(.*)|i", $plugin_data, $author_name);
+		preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri);
+		$description = wptexturize(wp_filter_kses($description[1]));
+
+		if ('' == $plugin_uri) {
+			$plugin = $plugin_name[1];
+		} else {
+			$plugin = wp_filter_kses("<a href='{$plugin_uri[1]}' title='Visit plugin homepage'>{$plugin_name[1]}</a>");
+		}
+
+		if ('' == $author_uri) {
+			$author = $author_name[1];
+		} else {
+			$author = wp_filter_kses("<a href='{$author_uri[1]}' title='Visit author homepage'>{$author_name[1]}</a>");
+		}
+
+
+
+		$style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
+		echo "
+	<tr $style>
+		<td>$plugin</td>
+		<td>$author</td>
+		<td>$description</td>
+		<td><a href='' class='edit'>activate</a></td>
+	</tr>";
+	}
+?>
+
+</table>
+<?php
+}
+?>
+</div>
+
+<?php
+
+include('admin-footer.php');
+?>
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index d95d694e2a..1cf2b49824 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -788,6 +788,12 @@ function upgrade_110() {
 	if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'moderation_keys'")) {
 		$wpdb->query("INSERT INTO $tableoptions (option_name, option_type, option_value, option_admin_level) VALUES ('moderation_keys', 3, '', 8)");
 	}
+
+	// Option for plugins
+	if(!$wpdb->get_var("SELECT option_id FROM $tableoptions WHERE option_name = 'active_plugins'")) {
+		$wpdb->query("INSERT INTO $tableoptions (option_name, option_type, option_value, option_admin_level) VALUES ('active_plugins', 3, '', 8)");
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php
new file mode 100644
index 0000000000..68332f7d6c
--- /dev/null
+++ b/wp-content/plugins/hello.php
@@ -0,0 +1,13 @@
+<?php
+/*
+Plugin Name: Hello Dolly
+Plugin URI: http://wordpress.org/#
+Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong. Hello, Dolly. This is, by the way, the world's first official WordPress plugin. Wish it did something useful.
+Author: Matt Mullenweg
+Author URI: http://photomatt.net
+*/ 
+
+function hello_dolly() {
+	echo "It's me, Dolly.";
+}
+?>
\ No newline at end of file