diff --git a/ChangeLog b/ChangeLog
index 569655e3e..1d12c3e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-27	Paul Giblock <drfaygo/at/gmail/dot/com>
+	* include/controller_view.h:
+	* src/gui/widgets/controller_view.cpp:
+	Add stub for controller help
+	
 2008-08-26	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* cmake/modules/DetectMachine.cmake:
diff --git a/include/controller_view.h b/include/controller_view.h
index 8fac4f9bd..41e866bdf 100644
--- a/include/controller_view.h
+++ b/include/controller_view.h
@@ -60,7 +60,7 @@ public:
 public slots:
 	void editControls( void );
 	void deleteController( void );
-	//void displayHelp( void );
+	void displayHelp( void );
 	void closeControls( void );
 
 	
diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp
index b8746fabf..86a8062a2 100644
--- a/src/gui/widgets/controller_view.cpp
+++ b/src/gui/widgets/controller_view.cpp
@@ -84,6 +84,8 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) :
 
 	m_subWindow->hide();
 
+	setWhatsThis( tr( "Controllers are able to automate the value of a knob, "
+				"slider, and other controls."  ) );
 
 	setModel( _model );
 }
@@ -203,6 +205,14 @@ void controllerView::contextMenuEvent( QContextMenuEvent * )
 
 
 
+void controllerView::displayHelp( void )
+{
+	QWhatsThis::showText( mapToGlobal( rect().center() ),
+								whatsThis() );
+}
+
+
+
 #include "moc_controller_view.cxx"
 
 #endif