diff --git a/CHANGES.txt b/CHANGES.txt
index 7840d6a0d05..9509328aa60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Release 0.3.0 - Unreleased
                invalidating entries (Andrew Purtell via Stack)
    HBASE-819   Remove DOS-style ^M carriage returns from all code where found
                (Jonathan Gray via Jim Kellerman)
+   HBASE-818   Deadlock running 'flushSomeRegions' (Andrew Purtell via Stack)
 
   IMPROVEMENTS
    HBASE-801  When a table haven't disable, shell could response in a "user
diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 875eb7dfbec..fc9d5e7b98c 100644
--- a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -1624,8 +1624,9 @@ public class HRegion implements HConstants {
         return;
       }
       writestate.flushRequested = true;
-      this.flushListener.request(this);
     }
+    // Make request outside of synchronize block; HBASE-818.
+    this.flushListener.request(this);
     if (LOG.isDebugEnabled()) {
       LOG.debug("Flush requested on " + this);
     }