diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index 09ca04c..0d2bcd0 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -2876,4 +2876,9 @@ public class BinaryJedis implements BinaryJedisCommands {
     public Client getClient() {
         return client;
     }
+
+    public String bgrewriteof() {
+        client.bgrewriteaof();
+        return client.getStatusCodeReply();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/redis/clients/jedis/Commands.java b/src/main/java/redis/clients/jedis/Commands.java
index 63bead0..0e9d5b1 100644
--- a/src/main/java/redis/clients/jedis/Commands.java
+++ b/src/main/java/redis/clients/jedis/Commands.java
@@ -214,4 +214,5 @@ public interface Commands {
     public void linsert(final String key, final LIST_POSITION where,
             final String pivot, final String value);
 
+    public void bgrewriteaof();
 }
\ No newline at end of file
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index c8ffe5c..f0aa637 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -2581,4 +2581,9 @@ public class Jedis extends BinaryJedis implements JedisCommands {
         client.linsert(key, where, pivot, value);
         return client.getIntegerReply();
     }
+
+    public String bgrewriteof() {
+        client.bgrewriteaof();
+        return client.getStatusCodeReply();
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
index 514305e..8301d60 100644
--- a/src/main/java/redis/clients/jedis/Pipeline.java
+++ b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -406,4 +406,8 @@ public class Pipeline implements Commands {
     public List<Object> execute() {
         return client.getAll();
     }
+
+    public void bgrewriteaof() {
+        client.bgrewriteaof();
+    }
 }
diff --git a/src/main/java/redis/clients/jedis/PipelineBlock.java b/src/main/java/redis/clients/jedis/PipelineBlock.java
index 23fe90d..7638402 100644
--- a/src/main/java/redis/clients/jedis/PipelineBlock.java
+++ b/src/main/java/redis/clients/jedis/PipelineBlock.java
@@ -402,5 +402,9 @@ public abstract class PipelineBlock implements Commands {
         client.zunionstore(dstkey, params, sets);
     }
 
+    public void bgrewriteaof() {
+        client.bgrewriteaof();
+    }
+
     public abstract void execute();
 }
diff --git a/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java
index 8d46519..77d18db 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/StringValuesCommandsTest.java
@@ -10,183 +10,184 @@ import redis.clients.jedis.JedisException;
 public class StringValuesCommandsTest extends JedisCommandTestBase {
     @Test
     public void setAndGet() {
-	String status = jedis.set("foo", "bar");
-	assertEquals("OK", status);
+        String status = jedis.set("foo", "bar");
+        assertEquals("OK", status);
 
-	String value = jedis.get("foo");
-	assertEquals("bar", value);
+        String value = jedis.get("foo");
+        assertEquals("bar", value);
 
-	assertEquals(null, jedis.get("bar"));
+        assertEquals(null, jedis.get("bar"));
     }
 
     @Test
     public void getSet() {
-	String value = jedis.getSet("foo", "bar");
-	assertEquals(null, value);
-	value = jedis.get("foo");
-	assertEquals("bar", value);
+        String value = jedis.getSet("foo", "bar");
+        assertEquals(null, value);
+        value = jedis.get("foo");
+        assertEquals("bar", value);
     }
 
     @Test
     public void mget() {
-	List<String> values = jedis.mget("foo", "bar");
-	List<String> expected = new ArrayList<String>();
-	expected.add(null);
-	expected.add(null);
+        List<String> values = jedis.mget("foo", "bar");
+        List<String> expected = new ArrayList<String>();
+        expected.add(null);
+        expected.add(null);
 
-	assertEquals(expected, values);
+        assertEquals(expected, values);
 
-	jedis.set("foo", "bar");
+        jedis.set("foo", "bar");
 
-	expected = new ArrayList<String>();
-	expected.add("bar");
-	expected.add(null);
-	values = jedis.mget("foo", "bar");
+        expected = new ArrayList<String>();
+        expected.add("bar");
+        expected.add(null);
+        values = jedis.mget("foo", "bar");
 
-	assertEquals(expected, values);
+        assertEquals(expected, values);
 
-	jedis.set("bar", "foo");
+        jedis.set("bar", "foo");
 
-	expected = new ArrayList<String>();
-	expected.add("bar");
-	expected.add("foo");
-	values = jedis.mget("foo", "bar");
+        expected = new ArrayList<String>();
+        expected.add("bar");
+        expected.add("foo");
+        values = jedis.mget("foo", "bar");
 
-	assertEquals(expected, values);
+        assertEquals(expected, values);
     }
 
     @Test
     public void setnx() {
-	long status = jedis.setnx("foo", "bar");
-	assertEquals(1, status);
-	assertEquals("bar", jedis.get("foo"));
+        long status = jedis.setnx("foo", "bar");
+        assertEquals(1, status);
+        assertEquals("bar", jedis.get("foo"));
 
-	status = jedis.setnx("foo", "bar2");
-	assertEquals(0, status);
-	assertEquals("bar", jedis.get("foo"));
+        status = jedis.setnx("foo", "bar2");
+        assertEquals(0, status);
+        assertEquals("bar", jedis.get("foo"));
     }
 
     @Test
     public void setex() {
-	String status = jedis.setex("foo", 20, "bar");
-	assertEquals("OK", status);
-	long ttl = jedis.ttl("foo");
-	assertTrue(ttl > 0 && ttl <= 20);
+        String status = jedis.setex("foo", 20, "bar");
+        assertEquals("OK", status);
+        long ttl = jedis.ttl("foo");
+        assertTrue(ttl > 0 && ttl <= 20);
     }
 
     @Test
     public void mset() {
-	String status = jedis.mset("foo", "bar", "bar", "foo");
-	assertEquals("OK", status);
-	assertEquals("bar", jedis.get("foo"));
-	assertEquals("foo", jedis.get("bar"));
+        String status = jedis.mset("foo", "bar", "bar", "foo");
+        assertEquals("OK", status);
+        assertEquals("bar", jedis.get("foo"));
+        assertEquals("foo", jedis.get("bar"));
     }
 
     @Test
     public void msetnx() {
-	long status = jedis.msetnx("foo", "bar", "bar", "foo");
-	assertEquals(1, status);
-	assertEquals("bar", jedis.get("foo"));
-	assertEquals("foo", jedis.get("bar"));
+        long status = jedis.msetnx("foo", "bar", "bar", "foo");
+        assertEquals(1, status);
+        assertEquals("bar", jedis.get("foo"));
+        assertEquals("foo", jedis.get("bar"));
 
-	status = jedis.msetnx("foo", "bar1", "bar2", "foo2");
-	assertEquals(0, status);
-	assertEquals("bar", jedis.get("foo"));
-	assertEquals("foo", jedis.get("bar"));
+        status = jedis.msetnx("foo", "bar1", "bar2", "foo2");
+        assertEquals(0, status);
+        assertEquals("bar", jedis.get("foo"));
+        assertEquals("foo", jedis.get("bar"));
     }
 
     @Test(expected = JedisException.class)
     public void incrWrongValue() {
-	jedis.set("foo", "bar");
-	jedis.incr("foo");
+        jedis.set("foo", "bar");
+        jedis.incr("foo");
     }
 
     @Test
     public void incr() {
-	long value = jedis.incr("foo");
-	assertEquals(1, value);
-	value = jedis.incr("foo");
-	assertEquals(2, value);
+        long value = jedis.incr("foo");
+        assertEquals(1, value);
+        value = jedis.incr("foo");
+        assertEquals(2, value);
     }
 
     @Test(expected = JedisException.class)
     public void incrByWrongValue() {
-	jedis.set("foo", "bar");
-	jedis.incrBy("foo", 2);
+        jedis.set("foo", "bar");
+        jedis.incrBy("foo", 2);
     }
 
     @Test
     public void incrBy() {
-	long value = jedis.incrBy("foo", 2);
-	assertEquals(2, value);
-	value = jedis.incrBy("foo", 2);
-	assertEquals(4, value);
+        long value = jedis.incrBy("foo", 2);
+        assertEquals(2, value);
+        value = jedis.incrBy("foo", 2);
+        assertEquals(4, value);
     }
 
     @Test(expected = JedisException.class)
     public void decrWrongValue() {
-	jedis.set("foo", "bar");
-	jedis.decr("foo");
+        jedis.set("foo", "bar");
+        jedis.decr("foo");
     }
 
     @Test
     public void decr() {
-	long value = jedis.decr("foo");
-	assertEquals(-1, value);
-	value = jedis.decr("foo");
-	assertEquals(-2, value);
+        long value = jedis.decr("foo");
+        assertEquals(-1, value);
+        value = jedis.decr("foo");
+        assertEquals(-2, value);
     }
 
     @Test(expected = JedisException.class)
     public void decrByWrongValue() {
-	jedis.set("foo", "bar");
-	jedis.decrBy("foo", 2);
+        jedis.set("foo", "bar");
+        jedis.decrBy("foo", 2);
     }
 
     @Test
     public void decrBy() {
-	long value = jedis.decrBy("foo", 2);
-	assertEquals(-2, value);
-	value = jedis.decrBy("foo", 2);
-	assertEquals(-4, value);
+        long value = jedis.decrBy("foo", 2);
+        assertEquals(-2, value);
+        value = jedis.decrBy("foo", 2);
+        assertEquals(-4, value);
     }
 
     @Test
     public void append() {
-	long value = jedis.append("foo", "bar");
-	assertEquals(3, value);
-	assertEquals("bar", jedis.get("foo"));
-	value = jedis.append("foo", "bar");
-	assertEquals(6, value);
-	assertEquals("barbar", jedis.get("foo"));
+        long value = jedis.append("foo", "bar");
+        assertEquals(3, value);
+        assertEquals("bar", jedis.get("foo"));
+        value = jedis.append("foo", "bar");
+        assertEquals(6, value);
+        assertEquals("barbar", jedis.get("foo"));
     }
 
     @Test
     public void substr() {
-	jedis.set("s", "This is a string");
-	assertEquals("This", jedis.substr("s", 0, 3));
-	assertEquals("ing", jedis.substr("s", -3, -1));
-	assertEquals("This is a string", jedis.substr("s", 0, -1));
-	assertEquals(" string", jedis.substr("s", 9, 100000));
+        jedis.set("s", "This is a string");
+        assertEquals("This", jedis.substr("s", 0, 3));
+        assertEquals("ing", jedis.substr("s", -3, -1));
+        assertEquals("This is a string", jedis.substr("s", 0, -1));
+        assertEquals(" string", jedis.substr("s", 9, 100000));
     }
 
     @Test
     public void strlen() {
-	jedis.set("s", "This is a string");
-	assertEquals("This is a string".length(), jedis.strlen("s").intValue());
+        jedis.set("s", "This is a string");
+        assertEquals("This is a string".length(), jedis.strlen("s").intValue());
+    }
+
+    @Test
+    public void incrLargeNumbers() {
+        long value = jedis.incr("foo");
+        assertEquals(1, value);
+        assertEquals(1L + Integer.MAX_VALUE, (long) jedis.incrBy("foo",
+                Integer.MAX_VALUE));
+    }
+
+    @Test(expected = JedisException.class)
+    public void incrReallyLargeNumbers() {
+        jedis.set("foo", Long.toString(Long.MAX_VALUE));
+        long value = jedis.incr("foo");
+        assertEquals(Long.MIN_VALUE, value);
     }
-	
-	@Test
-	public void incrLargeNumbers() {
-		long value = jedis.incr("foo");
-		assertEquals(1, value);
-		assertEquals(1L + Integer.MAX_VALUE, (long) jedis.incrBy("foo", Integer.MAX_VALUE));
-	}
-	
-	@Test
-	public void incrReallyLargeNumbers() {
-		jedis.set("foo", Long.toString(Long.MAX_VALUE));
-		long value = jedis.incr("foo");
-		assertEquals(Long.MIN_VALUE, value);
-	}
 }
\ No newline at end of file