diff --git a/bin/elasticsearch.bat b/bin/elasticsearch.bat
index 90e45e23621..00388e7d0aa 100644
--- a/bin/elasticsearch.bat
+++ b/bin/elasticsearch.bat
@@ -33,6 +33,9 @@ set JAVA_OPTS=%JAVA_OPTS% -XX:MaxTenuringThreshold=1
 set JAVA_OPTS=%JAVA_OPTS% -XX:CMSInitiatingOccupancyFraction=75
 set JAVA_OPTS=%JAVA_OPTS% -XX:+UseCMSInitiatingOccupancyOnly
 
+REM When running under Java 7
+REM JAVA_OPTS=%JAVA_OPTS% -XX:+UseCondCardMark
+
 REM GC logging options -- uncomment to enable
 REM JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDetails
 REM JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCTimeStamps
diff --git a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
index b3230b58184..7ee2c9b039f 100644
--- a/bin/elasticsearch.in.sh
+++ b/bin/elasticsearch.in.sh
@@ -32,6 +32,9 @@ JAVA_OPTS="$JAVA_OPTS -XX:MaxTenuringThreshold=1"
 JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JAVA_OPTS="$JAVA_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 
+# When running under Java 7
+#JAVA_OPTS="$JAVA_OPTS -XX:+UseCondCardMark"
+
 # GC logging options -- uncomment to enable
 # JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
 # JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCTimeStamps"