diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php
index 8e51282d5a8..fc99660d61f 100644
--- a/lib/Cake/Controller/Scaffold.php
+++ b/lib/Cake/Controller/Scaffold.php
@@ -28,7 +28,8 @@
  * and afford the web developer an early look at the data, and the possibility to over-ride
  * scaffolded actions with custom-made ones.
  *
- * @package       Cake.Controller
+ * @package Cake.Controller
+ * @deprecated Dynamic scaffolding will be removed and replaced in 3.0
  */
 class Scaffold {
 
diff --git a/lib/Cake/View/ScaffoldView.php b/lib/Cake/View/ScaffoldView.php
index 3b827a7740c..8bcefcc4fbd 100644
--- a/lib/Cake/View/ScaffoldView.php
+++ b/lib/Cake/View/ScaffoldView.php
@@ -23,7 +23,8 @@
 /**
  * ScaffoldView provides specific view file loading features for scaffolded views.
  *
- * @package       Cake.View
+ * @package Cake.View
+ * @deprecated Dynamic scaffolding will be removed and replaced in 3.0
  */
 class ScaffoldView extends View {