diff --git a/pmd/etc/changelog.txt b/pmd/etc/changelog.txt
index 644ad4911a..53c32f5e2a 100644
--- a/pmd/etc/changelog.txt
+++ b/pmd/etc/changelog.txt
@@ -4,6 +4,7 @@ Fixed bug  991: AvoidSynchronizedAtMethodLevel for static methods
 Fixed bug 1084: NPE at UselessStringValueOfRule.java:36
 Fixed bug 1091: file extension for fortran seems to be wrong in cpdgui tools
 Fixed bug 1092: Wrong Attribute "excludemarker" in Ant Task Documentation
+Fixed bug 1095: AvoidFinalLocalVariable false positive
 Fixed bug 1099: UseArraysAsList false positives
 Fixed bug 1102: False positive: shift operator parenthesis
 Fixed bug 1104: IdempotentOperation false positive
diff --git a/pmd/src/main/resources/rulesets/java/controversial.xml b/pmd/src/main/resources/rulesets/java/controversial.xml
index e5de9aeb6f..ed6a6a239b 100644
--- a/pmd/src/main/resources/rulesets/java/controversial.xml
+++ b/pmd/src/main/resources/rulesets/java/controversial.xml
@@ -366,6 +366,7 @@ Avoid using final local variables, turn them into fields.
                   <value><![CDATA[
 //LocalVariableDeclaration[
   @Final = 'true'
+  and not(../../ForStatement)
   and
   (
     (count(VariableDeclarator/VariableInitializer) = 0)
diff --git a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java b/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
index dec8b823a2..fe1094fe4e 100644
--- a/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
+++ b/pmd/src/test/java/net/sourceforge/pmd/lang/java/rule/controversial/ControversialRulesTest.java
@@ -12,7 +12,6 @@ public class ControversialRulesTest extends SimpleAggregatorTst {
     @Before
     public void setUp() {
         addRule(RULESET, "AssignmentInOperand");
-        addRule(RULESET, "AvoidFinalLocalVariable");
         addRule(RULESET, "AvoidLiteralsInIfCondition");
         addRule(RULESET, "AvoidPrefixingMethodParameters");
         addRule(RULESET, "AvoidUsingNativeCode");
diff --git a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
index 4581b12df5..dc6fb80beb 100644
--- a/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
+++ b/pmd/src/test/resources/net/sourceforge/pmd/lang/java/rule/controversial/xml/AvoidFinalLocalVariable.xml
@@ -51,4 +51,17 @@ public class A {
 }
 	 ]]></code>
     </test-code>
+    <test-code>
+        <description>#1095 AvoidFinalLocalVariable false positive</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Test {
+
+    public void test() {
+        final File[] files = new File(".").listFiles();
+        for (final File f : files) { f.getAbsolutePath(); }
+    }
+}
+        ]]></code>
+    </test-code>
 </test-data>