diff --git a/mktestconfig.sh b/mktestconfig.sh
index 219914e..c650ad8 100644
--- a/mktestconfig.sh
+++ b/mktestconfig.sh
@@ -1 +1 @@
-echo "{\"owners\": [\"test\"],\"nickname\": \"test\",\"username\": \"test\",\"realname\": \"test\",\"password\": \"\",\"server\": \"irc.fyrechat.net\",\"port\": 6667,\"channels\": [\"#test\", \"#test2\"]}" > config.json
+echo "{\"owners\": [\"test\"],\"nickname\": \"test\",\"username\": \"test\",\"realname\": \"test\",\"password\": \"\",\"server\": \"irc.fyrechat.net\",\"port\": 6667,\"channels\": [\"#test\", \"#test2\"],\"options\": {}}" > config.json
diff --git a/src/data.rs b/src/data.rs
index 3586949..9e46462 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::io::fs::File;
 use std::io::{InvalidInput, IoError, IoResult};
 use serialize::json::{decode};
@@ -79,6 +80,7 @@ pub struct Config {
     pub server: String,
     pub port: u16,
     pub channels: Vec<String>,
+    pub options: HashMap<String, String>,
 }
 
 impl Config {