diff --git a/pocketbot.go b/pocketbot.go
index f713ccd..fd0adec 100644
--- a/pocketbot.go
+++ b/pocketbot.go
@@ -43,6 +43,13 @@ func main() {
 	Session.AddHandler(ready)
 	Session.AddHandler(Router.OnMessageCreate)
 
+	//Set the command prefix
+	if os.Getenv("POCKETBOT_PREFIX") != "" {
+		Router.Prefix = os.Getenv("POCKETBOT_PREFIX")
+	} else {
+		Router.Prefix = "!"
+	}
+
 	// Register the build-in help command.
 	Router.Route("help", "Display this message.", Router.Help)
 	Router.Route("swear", "Make me swear!", getSwear)