diff --git a/main.go b/main.go
index ca3b37c..31e986c 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,8 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	"os"
+	"strconv"
 
 	syslog "gopkg.in/mcuadros/go-syslog.v2"
 	"gopkg.in/mcuadros/go-syslog.v2/format"
@@ -38,7 +40,18 @@ func main() {
 	syslogSocketPath := flag.String("syslogd-socket", "", "The socket to listen to syslog addresses")
 	// dumpSocketPath := flag.String("dump-socket", "/run/buffer.sock", "The socket that user will connect to in order to receive logs")
 	bufsize := flag.Int("buffer-size", 1000, "Number of messages to keep")
+	UDPPort := flag.Int("log-port", 9514, "UDP port where to listen for syslog messages")
+	TCPPort := flag.Int("query-port", 9080, "TCP port where to listen for queries from the buffer")
+	address := flag.String("addr", "127.0.0.1", "Address to bind to")
 	flag.Parse()
+	if *TCPPort > 65535 || *TCPPort < 1 {
+		fmt.Fprintf(os.Stderr, "Error: selected query-port is out of bounds: %d\n", *TCPPort)
+		os.Exit(1)
+	}
+	if *UDPPort > 65535 || *UDPPort < 1 {
+		fmt.Fprintf(os.Stderr, "Error: selected log-port is out of bounds: %d\n", *UDPPort)
+		os.Exit(1)
+	}
 
 	channel := make(chan format.LogParts)
 	handler := syslog.NewChannelHandler(channel)
@@ -49,8 +62,9 @@ func main() {
 	if *syslogSocketPath != "" {
 		server.ListenUnixgram(*syslogSocketPath)
 		fmt.Printf("Binding socket `%s` [syslog]\n", *syslogSocketPath)
+		os.Exit(2)
 	} else {
-		addr := "127.0.0.1:9514"
+		addr := *address + ":" + strconv.Itoa(*UDPPort)
 		fmt.Printf("Binding address `%s` [syslog]\n", addr)
 		server.ListenUDP(addr)
 	}
@@ -59,8 +73,9 @@ func main() {
 	go syslogdHandler(channel)
 
 	http.HandleFunc("/", httpHandler)
-	fmt.Printf("Binding address `%s` [http]\n", ":9080")
-	http.ListenAndServe(":9080", nil)
+	listenPortFmt := ":" + strconv.Itoa(*TCPPort)
+	fmt.Printf("Binding address `%s` [http]\n", listenPortFmt)
+	http.ListenAndServe(listenPortFmt, nil)
 
 	server.Wait()
 }