diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar
index 3d88e948b6..79ca2c562a 100644
Binary files a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar and b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/lib/pmd-5.0.jar differ
diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java
index 749e0af067..e71f70811f 100644
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java
@@ -445,11 +445,13 @@ public class ReviewCodeCmd extends AbstractDefaultCommand {
          
          RuleSet filteredRuleSet = RuleSetUtil.newCopyOf(ruleSet);
          RuleSetUtil.retainOnly(filteredRuleSet, activeRuleNames);
+         filteredRuleSet.setExcludePatterns(preferences.activeExclusionPatterns());
+         filteredRuleSet.setIncludePatterns(preferences.activeInclusionPatterns());
+         
          taskScope(filteredRuleSet.getRules().size(), ruleSet.getRules().size());
          return filteredRuleSet;
     }
     
-    
     private RuleSet rulesetFromResourceDelta() throws PropertiesException, CommandException{
     	
     	 IResource resource = resourceDelta.getResource();
diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java
index c2e6b9d80a..7824444939 100755
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/actions/RuleSetUtil.java
@@ -33,7 +33,7 @@ public class RuleSetUtil {
 	 * internal container....oops!  :)
 	 * 
 	 * @param ruleSet
-	 * @param unwantedRuleNames
+	 * @param wantedRuleNames
 	 */
 	public static void retainOnly(RuleSet ruleSet, Set<String> wantedRuleNames) {
 		
@@ -46,6 +46,5 @@ public class RuleSetUtil {
 				rules.remove(rule);
 			}
 		}
-		
 	}
 }
diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/filters/FilterPreferencesPage.java b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/filters/FilterPreferencesPage.java
index 80f6e0b855..93a511c055 100644
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/filters/FilterPreferencesPage.java
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/src/net/sourceforge/pmd/eclipse/ui/filters/FilterPreferencesPage.java
@@ -189,7 +189,6 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
 		tableViewer.setLabelProvider(labelProvider);
 		tableViewer.setContentProvider(contentProvider);
 		table.setHeaderVisible(true);
-		//     labelProvider.addColumnsTo(table);
 
 		tableViewer.setInput( currentFilters() );
 
@@ -528,7 +527,8 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
 		FilterHolder[] holders = tableFiltersWith(newHolder);
 		tableViewer.setInput( holders );
 		
-		tableViewer.getTable().select(holders.length-1);
+		tableViewer.getTable().setSelection(holders.length-1);
+
 		patternsSelected();
 		patternField.selectAll();
 		patternField.forceFocus();
@@ -559,7 +559,7 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
 		Object[] selections = sel.toArray();
 		tableViewer.remove(selections);
 	}
-
+	
 	/**
 	 * @return boolean
 	 * @see org.eclipse.jface.preference.IPreferencePage#performOk() */
@@ -570,11 +570,12 @@ public class FilterPreferencesPage extends AbstractPMDPreferencePage implements
 	    RuleSet ruleSet = ipMgr.getRuleSet();
 	    ruleSet.setExcludePatterns( tableFilters(false) );
 	    ruleSet.setIncludePatterns( tableFilters(true) );
-	    
+		ipMgr.setRuleSet(ruleSet);
+		
 		Set<FilterHolder> filters = currentCheckedFilters();
 		preferences.activeExclusionPatterns( patternsIn(filters, false) );
 		preferences.activeInclusionPatterns( patternsIn(filters, true) );
-
+		
 		preferences.sync();
 	
 		return super.performOk();