diff --git a/src/Gitolite/Conf/Sugar.pm b/src/Gitolite/Conf/Sugar.pm
index 932928d..881cbcf 100644
--- a/src/Gitolite/Conf/Sugar.pm
+++ b/src/Gitolite/Conf/Sugar.pm
@@ -45,12 +45,30 @@ sub sugar {
 
     # then our stuff:
 
+    $lines = option($lines);
     $lines = owner_desc($lines);
     # $lines = name_vref($lines);
 
     return $lines;
 }
 
+sub option {
+    my $lines = shift;
+    my @ret;
+
+    # option foo = bar
+    #   ->  config gitolite-options.foo = bar
+
+    for my $line (@$lines) {
+        if ( $line =~ /^option (\S+) = (\S.*)/ ) {
+            push @ret, "config gitolite-options.$1 = $2";
+        } else {
+            push @ret, $line;
+        }
+    }
+    return \@ret;
+}
+
 sub owner_desc {
     my $lines = shift;
     my @ret;