diff --git a/ocis/pkg/runtime/options.go b/ocis/pkg/runtime/options.go
index 6f292c472..2fc4addd5 100644
--- a/ocis/pkg/runtime/options.go
+++ b/ocis/pkg/runtime/options.go
@@ -12,7 +12,7 @@ type Options struct {
 	Context  *cli.Context
 }
 
-// Option undocummented
+// Option undocumented
 type Option func(o *Options)
 
 // Services option
diff --git a/ocis/templates/CONFIGURATION.tmpl b/ocis/templates/CONFIGURATION.tmpl
index 463df0150..db8763b9d 100644
--- a/ocis/templates/CONFIGURATION.tmpl
+++ b/ocis/templates/CONFIGURATION.tmpl
@@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com
 
 So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.
 
-### Envrionment variables
+### Environment variables
 
 If you prefer to configure the service with environment variables you can see the available variables below.