diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfind.java b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
similarity index 56%
rename from Essentials/src/com/earth2me/essentials/commands/Commandfind.java
rename to Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
index 40590501f..2fff20e8c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfind.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
@@ -2,12 +2,13 @@ package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 
-public class Commandfind extends EssentialsCommand
+public class Commanditemdb extends EssentialsCommand
 {
-	public Commandfind()
+	public Commanditemdb()
 	{
 		super("find");
 	}
@@ -15,11 +16,22 @@ public class Commandfind extends EssentialsCommand
 	@Override
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
+		ItemStack itemStack = null;
 		if (args.length < 1)
 		{
-			throw new NotEnoughArgumentsException();
+			if (sender instanceof Player)
+			{
+				itemStack = ((Player)sender).getItemInHand();
+			}
+			if (itemStack == null)
+			{
+				throw new NotEnoughArgumentsException();
+			}
+		}
+		else
+		{
+			itemStack = ess.getItemDb().get(args[0]);
 		}
-		ItemStack itemStack = ess.getItemDb().get(args[0]);
 		sender.sendMessage(itemStack.getType().toString() + "- " + itemStack.getTypeId() + ":" + Integer.toString(itemStack.getData().getData()));
 	}
 }
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 681ff428f..ac1ced96e 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -102,10 +102,10 @@ commands:
     description: Satisfy the hunger.
     usage: /<command> [player]
     aliases: [efeed]
-  find:
+  itemdb:
     description: Searches for an item.
     usage: /<command> <item>
-    aliases: [efind]
+    aliases: [eitemdb]
   fireball:
     description: Throw a fireball.
     usage: /<command> [small]