diff --git a/GITFLOW_VERSION.md b/GITFLOW_VERSION.md
index 7abd37d..ccc7297 100644
--- a/GITFLOW_VERSION.md
+++ b/GITFLOW_VERSION.md
@@ -1,10 +1,10 @@
-The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years
+The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs) This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years
 
 **How to check Git Flow version**
 
 run `git flow version` 
 
-If it says `0.4.1` then you have the wrong version. You will have to uninstall it and then refer to [AVH edition](https://github.com/petervanderdoes/gitflow) docs for installation. 
+If it says `0.4.1` then you have the wrong version. You will have to uninstall it and then refer to [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs) docs for installation. 
 
 
 **How to uninstall wrong version on OSX**
diff --git a/README.md b/README.md
index 46e4d6b..d026cd6 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Huge shoutout [to Kirill Likhodedov](https://github.com/klikh), who wrote much o
 
 The plugin is available via the IntelliJ plugin manager. Just search for "Git Flow Integration" to get the latest version!
 
-**The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years.** See this page [for details](https://github.com/OpherV/gitflow4idea/blob/develop/GITFLOW_VERSION.md)
+**The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years.** See this page [for details](https://github.com/OpherV/gitflow4idea/blob/develop/GITFLOW_VERSION.md)
 
 ## Caveats
 
diff --git a/src/main/java/gitflow/GitflowVersionTester.java b/src/main/java/gitflow/GitflowVersionTester.java
index c0b48c8..337945a 100644
--- a/src/main/java/gitflow/GitflowVersionTester.java
+++ b/src/main/java/gitflow/GitflowVersionTester.java
@@ -51,13 +51,13 @@ public String getVersion() {
 
 	/**
 	 * Returns true if the {@code git flow} version can be determined
-	 * and is any AVH version ({@code #contains("AVH")}) and
+	 * and is any AVH version ({@code #contains("AVH")}) or CJS version ({@code #contains("CJS")}) and
 	 * not the unmaintained NVIE version.
 	 *
-	 * @return true if we think the git flow version is an AVH version.
+	 * @return true if we think the git flow version is an AVH or CJS version.
 	 */
 	public boolean isSupportedVersion() {
-		return version != null && version.contains("AVH");
+		return version != null && (version.contains("AVH") || version.contains("CJS"));
 	}
 
 	public void init(){