diff --git a/conf.c b/conf.c
index a8df6c3d..69f915e7 100644
--- a/conf.c
+++ b/conf.c
@@ -70,7 +70,7 @@ static zend_object_value kafka_conf_new(zend_class_entry *class_type TSRMLS_DC)
     retval.handle = zend_objects_store_put(&intern->std, (zend_objects_store_dtor_t) zend_objects_destroy_object, kafka_conf_free, NULL TSRMLS_CC);
     retval.handlers = &kafka_object_handlers;
 
-    return retval;    
+    return retval;
 }
 /* }}} */
 
@@ -196,10 +196,9 @@ PHP_METHOD(RdKafka__Conf, dump)
 /* {{{ proto void RdKafka\Conf::set(RdKafka\Conf $conf, string $name, string $value[, string &$errstr])
    Sets a configuration property. */
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_conf_set, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_kafka_conf_set, 0, 0, 2)
     ZEND_ARG_INFO(0, name)
     ZEND_ARG_INFO(0, value)
-    ZEND_ARG_INFO(0, errstr)
 ZEND_END_ARG_INFO()
 
 PHP_METHOD(RdKafka__Conf, set)
diff --git a/tests/bugConfSetArgument.phpt b/tests/bugConfSetArgument.phpt
new file mode 100644
index 00000000..c06db15c
--- /dev/null
+++ b/tests/bugConfSetArgument.phpt
@@ -0,0 +1,18 @@
+--TEST--
+RdKafka\Conf
+--FILE--
+<?php
+
+class TestBug extends RdKafka\Conf
+{
+    public function set($name, $value)
+    {
+        return parent::set($name, $value);
+    }
+}
+
+$conf = new TestBug();
+$conf->set('metadata.broker.list', '127.0.0.1');
+echo "done" . PHP_EOL;
+--EXPECT--
+done