diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java
index 9b69c2f..67b6729 100644
--- a/src/main/java/redis/clients/jedis/Client.java
+++ b/src/main/java/redis/clients/jedis/Client.java
@@ -547,4 +547,12 @@ public class Client extends Connection {
     public void slaveofNoOne() {
 	sendCommand("SLAVEOF", "no", "one");
     }
+
+    public void configGet(String pattern) {
+	sendCommand("CONFIG", "GET", pattern);
+    }
+
+    public void configSet(String parameter, String value) {
+	sendCommand("CONFIG", "SET", parameter, value);
+    }
 }
\ 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 5046d2c..d06b0ed 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -670,4 +670,14 @@ public class Jedis {
 	return client.getStatusCodeReply();
     }
 
+    public List<String> configGet(String pattern) {
+	client.configGet(pattern);
+	return client.getMultiBulkReply();
+    }
+
+    public String configSet(String parameter, String value) {
+	client.configSet(parameter, value);
+	return client.getStatusCodeReply();
+    }
+
 }
\ No newline at end of file
diff --git a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
index 05bb571..2dc4b5e 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/ControlCommandsTest.java
@@ -1,5 +1,7 @@
 package redis.clients.jedis.tests.commands;
 
+import java.util.List;
+
 import org.junit.Test;
 
 import redis.clients.jedis.JedisException;
@@ -55,4 +57,19 @@ public class ControlCommandsTest extends JedisCommandTestBase {
 	    }
 	});
     }
+
+    @Test
+    public void configGet() {
+	List<String> info = jedis.configGet("m*");
+	assertNotNull(info);
+    }
+
+    @Test
+    public void configSet() {
+	List<String> info = jedis.configGet("maxmemory");
+	String memory = info.get(1);
+	String status = jedis.configSet("maxmemory", "200");
+	assertEquals("OK", status);
+	jedis.configSet("maxmemory", memory);
+    }
 }
\ No newline at end of file