diff --git a/ruleset.xml b/ruleset.xml
index d4f2f075fc..41e2756faf 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0"?>
-<ruleset name="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+<ruleset name="Autopsy ruleset"
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
   <description>
-  Ruleset used by Autopsy  
+  Ruleset used by Autopsy
   </description>
 
+  <rule ref="rulesets/java/basic.xml"/>
+  <rule ref="rulesets/java/clone.xml"/>
+  <rule ref="rulesets/java/codesize.xml"/>
+  <rule ref="rulesets/java/comments.xml"/>
+  <rule ref="rulesets/java/controversial.xml"/>
+  <rule ref="rulesets/java/coupling.xml"/>
+  <rule ref="rulesets/java/design.xml"/>
+  <rule ref="rulesets/java/empty.xml"/>
+  <rule ref="rulesets/java/finalizers.xml"/>
+  <rule ref="rulesets/java/imports.xml"/>
+  <rule ref="rulesets/java/javabeans.xml"/>
+  <rule ref="rulesets/java/logging-java.xml"/>
+  <rule ref="rulesets/java/migrating.xml"/>
+  <rule ref="rulesets/java/migrating_to_13.xml"/>
+  <rule ref="rulesets/java/migrating_to_14.xml"/>
+  <rule ref="rulesets/java/migrating_to_15.xml"/>
+  <rule ref="rulesets/java/naming.xml">
+	<exclude name="MethodNamingConvertions"/>
+  </rule>
+  <rule ref="rulesets/java/optimizations.xml"/>
+  <rule ref="rulesets/java/strictexception.xml">
+	<exclude name="AvoidCatchingGenericException"/>
+  <rule ref="rulesets/java/strings.xml"/>
+  <rule ref="rulesets/java/sunsecure.xml"/>
+  <rule ref="rulesets/java/typeresolution.xml"/>
+  <rule ref="rulesets/java/unnecessary.xml"/>
   <rule ref="rulesets/java/unusedcode.xml"/>
 
 </ruleset>