diff --git a/config/config.go b/config/config.go
index ba12fa645c8..3f140474566 100644
--- a/config/config.go
+++ b/config/config.go
@@ -30,6 +30,7 @@ type Config struct {
 	Provider     Provider
 	Reprovider   Reprovider
 	Experimental Experiments
+	Plugins      Plugins
 }
 
 const (
diff --git a/config/init.go b/config/init.go
index 7f11c3a3d06..d658866ef62 100644
--- a/config/init.go
+++ b/config/init.go
@@ -152,8 +152,8 @@ func DefaultDatastoreConfig() Datastore {
 func identityConfig(out io.Writer, nbits int) (Identity, error) {
 	// TODO guard higher up
 	ident := Identity{}
-	if nbits < 1024 {
-		return ident, errors.New("bitsize less than 1024 is considered unsafe")
+	if nbits < 2048 {
+		return ident, errors.New("bitsize less than 2048 is considered unsafe")
 	}
 
 	fmt.Fprintf(out, "generating %v-bit RSA keypair...", nbits)
diff --git a/config/plugins.go b/config/plugins.go
new file mode 100644
index 00000000000..004f5468f74
--- /dev/null
+++ b/config/plugins.go
@@ -0,0 +1,11 @@
+package config
+
+type Plugins struct {
+	Plugins map[string]Plugin `json:",omitempty"`
+	// TODO: Loader Path? Leaving that out for now due to security concerns.
+}
+
+type Plugin struct {
+	Disabled bool
+	Config   interface{}
+}