diff --git a/.gitignore b/.gitignore
index 975011ebeb..4ebd6e7d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ config.php
 logs
 patches
 rrd
+html/plugins/*
+!html/plugins/Test/
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 001d80728f..def06351e8 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -460,7 +460,25 @@ if ($packages)
         </li>
 <?php
 } # if ($packages)
+?>
 
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"> Plugins<b class="caret"></b></a>
+          <ul class="dropdown-menu">
+<?php
+Plugins::call('menu');
+?>
+            <li role="presentation" class="divider"></li>
+<?php
+if ($_SESSION['userlevel'] >= '10')
+{
+  echo('            <li><a href="plugin/view=admin">Plugin Admin</a></li>');
+}
+?>
+          </ul>
+        </li>
+
+<?php
 // Custom menubar entries.
 if(is_file("includes/print-menubar-custom.inc.php"))
 {
@@ -483,21 +501,6 @@ if(is_file("includes/print-menubar-custom.inc.php"))
             </div>
           </form>
         </li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"> Plugins<b class="caret"></b></a>
-          <ul class="dropdown-menu">
-<?php
-Plugins::call('menu');
-?>
-            <li role="presentation" class="divider"></li>
-<?php
-if ($_SESSION['userlevel'] >= '10')
-{
-  echo('            <li><a href="plugin/view=admin">Plugin Admin</a></li>');
-}
-?>
-          </ul>
-        </li>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><img src="images/16/wrench.png" border="0" align="absmiddle" /> System<b class="caret"></b></a>
         <ul class="dropdown-menu">
diff --git a/html/plugins/.gitignore b/html/plugins/.gitignore
deleted file mode 100644
index d6b7ef32c8..0000000000
--- a/html/plugins/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/html/plugins/Test/Test.inc.php b/html/plugins/Test/Test.inc.php
new file mode 100644
index 0000000000..c38f2a0f80
--- /dev/null
+++ b/html/plugins/Test/Test.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+echo('Well done, the plugin system is up and running');
+
+?>
diff --git a/html/plugins/Test/Test.php b/html/plugins/Test/Test.php
new file mode 100644
index 0000000000..dd11344388
--- /dev/null
+++ b/html/plugins/Test/Test.php
@@ -0,0 +1,9 @@
+<?php
+
+class Test {
+  public function menu() {
+    echo('<li><a href="plugin/p='.get_class().'">'.get_class().'</a></li>');
+  }
+}
+
+?>