diff --git a/lib/Cake/Console/Command/AppShell.php b/app/Console/Command/AppShell.php
similarity index 85%
rename from lib/Cake/Console/Command/AppShell.php
rename to app/Console/Command/AppShell.php
index 7cbf6e006..6aec56224 100644
--- a/lib/Cake/Console/Command/AppShell.php
+++ b/app/Console/Command/AppShell.php
@@ -19,13 +19,12 @@
 App::uses('Shell', 'Console');
 
 /**
- * This is a placeholder class.
- * Create the same file in app/Console/Command/AppShell.php
+ * Application Shell
  *
  * Add your application-wide methods in the class below, your shells
  * will inherit them.
  *
- * @package       Cake.Console
+ * @package       app.Console.Command
  */
 class AppShell extends Shell {
 
diff --git a/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php b/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
new file mode 100644
index 000000000..6aec56224
--- /dev/null
+++ b/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * AppShell file
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+App::uses('Shell', 'Console');
+
+/**
+ * Application Shell
+ *
+ * Add your application-wide methods in the class below, your shells
+ * will inherit them.
+ *
+ * @package       app.Console.Command
+ */
+class AppShell extends Shell {
+
+}