diff --git a/server/route.go b/server/route.go
index 5e180e1..499c752 100644
--- a/server/route.go
+++ b/server/route.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"git.xeserv.us/xena/route/lib/elfs"
 	proto "git.xeserv.us/xena/route/proto"
 	"github.com/Xe/ln"
 	"golang.org/x/net/context"
@@ -69,6 +70,10 @@ func (r *Route) Put(ctx context.Context, rt *proto.Route) (*proto.IDResponse, er
 		return nil, handleError(ctx, clitok, err, ln.F{"action": "Route.Put_getAuth"})
 	}
 
+	if rt.Host == "" {
+		rt.Host = elfs.MakeName() + r.cfg.DomainSuffix
+	}
+
 	drt, err := r.db.PutRoute(ctx, rt.Host, clitok.Owner)
 	if err != nil {
 		ln.Error(err, ln.F{"action": "Route.Put"})