diff --git a/plugins/github/src/META-INF/githubtracker.xml b/plugins/github/src/META-INF/githubtracker.xml
new file mode 100644
index 000000000000..3f70e9be02cc
--- /dev/null
+++ b/plugins/github/src/META-INF/githubtracker.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/github/src/META-INF/plugin.xml b/plugins/github/src/META-INF/plugin.xml
index db65ce0b988f..052df4b76398 100644
--- a/plugins/github/src/META-INF/plugin.xml
+++ b/plugins/github/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
 
   <depends>com.intellij.modules.lang</depends>
   <depends>Git4Idea</depends>
-  <depends>com.intellij.tasks</depends>
+  <depends optional="true" config-file="githubtracker.xml">com.intellij.tasks</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
@@ -14,7 +14,6 @@
     <applicationService serviceInterface="org.jetbrains.plugins.github.GithubSettings"
                         serviceImplementation="org.jetbrains.plugins.github.GithubSettings"/>
     <applicationConfigurable instance="org.jetbrains.plugins.github.ui.GitHubSettingsConfigurable"/>
-    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
   </extensions>
   <actions>
     <action id="Github.Share" class="org.jetbrains.plugins.github.GithubShareAction">
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java
index 5541bbd0a785..3b059e090d10 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCheckoutListener.java
@@ -82,7 +82,7 @@ public class GithubCheckoutListener implements CheckoutListener {
     final Runnable taskInitializationRunnable = new Runnable() {
       public void run() {
         try {
-          enableGithubTrackerIntergation(openedProject, settings.getLogin(), settings.getPassword(), author, name);
+          enableGithubTrackerIntegration(openedProject, settings.getLogin(), settings.getPassword(), author, name);
         }
         catch (Exception e) {
           // Ignore it
@@ -96,7 +96,11 @@ public class GithubCheckoutListener implements CheckoutListener {
     }
   }
 
-  private void enableGithubTrackerIntergation(final Project project, final String login, final String password, final String author, final String name) {
+  private void enableGithubTrackerIntegration(final Project project,
+                                              final String login,
+                                              final String password,
+                                              final String author,
+                                              final String name) {
     // Look for github repository type
     final TaskManagerImpl manager = (TaskManagerImpl)TaskManager.getManager(project);
     final TaskRepository[] allRepositories = manager.getAllRepositories();