diff --git a/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UseConcurrentHashMap.xml b/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UseConcurrentHashMap.xml
new file mode 100644
index 0000000000..d25d98509e
--- /dev/null
+++ b/pmd/regress/test/net/sourceforge/pmd/rules/controversial/xml/UseConcurrentHashMap.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-data>
+    <test-code>
+        <description><![CDATA[
+Basic use case
+     ]]></description>
+        <expected-problems>2</expected-problems>
+        <code><![CDATA[
+public class Foo {
+     private Map _map = new TreeMap();
+
+      public void m() {
+         Map m = new HashMap();
+      }
+
+      public Map contructMap() {
+         return new HashMap(); //not detected
+      }
+}
+     ]]></code>
+    </test-code>
+</test-data>
diff --git a/pmd/rulesets/controversial.xml b/pmd/rulesets/controversial.xml
index e00673ab0d..d6623121ed 100644
--- a/pmd/rulesets/controversial.xml
+++ b/pmd/rulesets/controversial.xml
@@ -712,6 +712,36 @@ public class PrimitiveType {
     </example>
   </rule>
 
+  <rule  name="UseConcurrentHashMap"
+      since="4.2.6"
+      message="If you run in Java5 and have concurrent access, you should use ConcurrentHashMap implementation"
+      class="net.sourceforge.pmd.rules.XPathRule"
+      externalInfoUrl="http://pmd.sourceforge.net/rules/controversial.html#UseConcurrentHashMap">
+    <description>
+Since Java5 brought a new implementation of the Map interface, specially designed for concurrent application.
+    </description>
+    <priority>3</priority>
+    <properties>
+      <property name="xpath">
+        <value>
+<![CDATA[
+//Type[../VariableDeclarator/VariableInitializer]/ReferenceType/ClassOrInterfaceType[@Image = 'Map']
+]]>
+        </value>
+      </property>
+    </properties>
+    <example>
+<![CDATA[
+public class ConcurrentApp {
+  public void getMyInstance() {
+    Map map = new HashMap(); 
+  }
+}
+]]>
+    </example>
+  </rule>
+
+
 </ruleset>