diff --git a/configuredialog.cpp b/configuredialog.cpp
index 19b88ee3d..392ee1066 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -2497,6 +2497,14 @@ void AppearancePage::MessageTagTab::slotEmitChangeCheck()
     slotEmitChanged();
 }
 
+#ifdef __GNUC__
+#warning FIXME: Shortcut Handling broken
+// Shortcut handling is broken for custom templates, tags and filters.
+// The code assumes that the key sequence widget's shortcut is NOT already
+// set when this function is called, which is no longer the case with the
+// new KKeySequenceWidget.
+// This needs better support from KKeySequenceWidget. --tmcguire
+#endif
 void AppearancePage::MessageTagTab::slotShortcutCaptured( const QKeySequence &sc )
 {
   QKeySequence mySc(sc);
diff --git a/customtemplates.cpp b/customtemplates.cpp
index 85522b17b..d48e618d7 100644
--- a/customtemplates.cpp
+++ b/customtemplates.cpp
@@ -342,7 +342,14 @@ void CustomTemplates::slotTypeActivated( int index )
 //btw, all the problems with KShortcut that you have are because KShortcut is a subclass of
 //QList<QKeySequence>. I have contacted Simon Hausmann who did this. I reworked the API, but
 //the list thing wasn't me. Really :) -- ahartmetz
-
+#ifdef __GNUC__
+#warning FIXME: Shortcut Handling broken
+// Shortcut handling is broken for custom templates, tags and filters.
+// The code assumes that the key sequence widget's shortcut is NOT already
+// set when this function is called, which is no longer the case with the
+// new KKeySequenceWidget.
+// This needs better support from KKeySequenceWidget. --tmcguire
+#endif
 void CustomTemplates::slotShortcutCaptured( const QKeySequence &shortcut )
 {
   bool assign = true;
diff --git a/foldershortcutdialog.cpp b/foldershortcutdialog.cpp
index 76637d0ba..0cb85f7ad 100644
--- a/foldershortcutdialog.cpp
+++ b/foldershortcutdialog.cpp
@@ -88,6 +88,14 @@ FolderShortcutDialog::~FolderShortcutDialog()
 {
 }
 
+#ifdef __GNUC__
+#warning FIXME: Shortcut Handling broken
+// Shortcut handling is broken for custom templates, tags and filters.
+// The code assumes that the key sequence widget's shortcut is NOT already
+// set when this function is called, which is no longer the case with the
+// new KKeySequenceWidget.
+// This needs better support from KKeySequenceWidget. --tmcguire
+#endif
 void FolderShortcutDialog::slotCapturedShortcut( const QKeySequence& sc )
 {
   if ( sc.isEmpty() ) {
diff --git a/kmfilterdlg.cpp b/kmfilterdlg.cpp
index 4ee9f8b1f..8880f778b 100644
--- a/kmfilterdlg.cpp
+++ b/kmfilterdlg.cpp
@@ -526,6 +526,14 @@ void KMFilterDlg::slotConfigureShortcutButtonToggled( bool aChecked )
   }
 }
 
+#ifdef __GNUC__
+#warning FIXME: Shortcut Handling broken
+// Shortcut handling is broken for custom templates, tags and filters.
+// The code assumes that the key sequence widget's shortcut is NOT already
+// set when this function is called, which is no longer the case with the
+// new KKeySequenceWidget.
+// This needs better support from KKeySequenceWidget. --tmcguire
+#endif
 void KMFilterDlg::slotCapturedShortcutChanged( const QKeySequence& ks )
 {
   if ( !ks.isEmpty() && !( kmkernel->getKMMainWidget()->shortcutIsValid( ks ) ) ) {