diff --git a/ChangeLog b/ChangeLog
index e929dadc5..98e799da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-22 16:52-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSTableView.h: Add formal protocols for
+	NSTableViewDelegate and NSTableViewDataSource.
+
 2013-09-22 15:59-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Headers/AppKit/NSAnimation.h: Add NSAnimationDelegate.
diff --git a/Headers/AppKit/NSTableView.h b/Headers/AppKit/NSTableView.h
index 7ffdd71cc..494a447c1 100644
--- a/Headers/AppKit/NSTableView.h
+++ b/Headers/AppKit/NSTableView.h
@@ -351,7 +351,13 @@ typedef enum _NSTableViewColumnAutoresizingStyle
  * Informal protocol NSTableDataSource 
  */
 
+@protocol NSTableViewDataSource
+#ifdef __OBJC2__
+@optional
+#else
+@end
 @interface NSObject (NSTableDataSource)
+#endif
 
 /**
  * Returns the number of records that the data source manages for <em>aTableView</em>.
@@ -402,8 +408,13 @@ APPKIT_EXPORT NSString *NSTableViewSelectionIsChangingNotification;
  * Methods Implemented by the Delegate
  */
 
+@protocol NSTableViewDelegate <NSObject>
+#ifdef __OBJC2__
+@optional
+#else
+@end
 @interface NSObject (NSTableViewDelegate)
-
+#endif
 - (BOOL) selectionShouldChangeInTableView: (NSTableView *)aTableView;
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
 - (void) tableView: (NSTableView*)tableView