diff --git a/.gitignore b/.gitignore
index 4a60582..f12ba57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.iml
 .idea
+bin/
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..894f3d2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+# Makefile for PNDPD
+
+BINARY=pndpd
+MODULES=
+VERSION=`git describe --tags`
+LDFLAGS=-ldflags "-X main.Version=${VERSION} -X main.Build=${BUILD}"
+
+build:
+	go build -tags=${MODULES} -o bin/${BINARY} .
+
+release:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${MODULES} ${LDFLAGS} -o bin/${BINARY}_linux_amd64.bin .
+
+release-all:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -tags=${MODULES} ${LDFLAGS} -o bin/${BINARY}_linux_amd64.bin
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -tags=${MODULES} ${LDFLAGS} -o bin/${BINARY}_linux_arm64.bin
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -tags=${MODULES} ${LDFLAGS} -o bin/${BINARY}_linux_arm.bin
+
+clean:
+	find bin/ -type f -delete
+	if [ -d "bin/" ]; then rm -d bin/ ;fi
\ No newline at end of file
diff --git a/README.md b/README.md
index 994a26e..da87ce4 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,13 @@ pndpd proxy <interface1> <interface2> <optional whitelist of CIDRs separated by
 More options and additional documentation in the example config file (``pndpd.conf ``).
 
 ## Developing
+
+### Building
+For building, the version of go needs to be installed that is specified in the go.mod file. A makefile is available. Optionally adjust the modules variable to include/exclude modules from the modules directory.
+````
+make build
+make release
+```` 
 ### Adding Modules 
 It is easy to add functionality to PNDPD. For additions outside the core functionality you only need to keep the following methods in mind:
 ```` 
diff --git a/main.go b/main.go
index cc15a51..a28f04c 100644
--- a/main.go
+++ b/main.go
@@ -13,16 +13,10 @@ import (
 	_ "pndpd/modules/userInterface"
 )
 
-// waitForSignal Waits (blocking) for the program to be interrupted by the OS
-func waitForSignal() {
-	var sigCh = make(chan os.Signal, 1)
-	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
-	<-sigCh
-	close(sigCh)
-}
+var Version = "Development"
 
 func main() {
-	fmt.Println("PNDPD Version 1.2.1 - Kioubit 2021")
+	fmt.Println("PNDPD Version", Version, "- Kioubit 2021")
 
 	if len(os.Args) <= 2 {
 		printUsage()
@@ -64,3 +58,11 @@ func printUsage() {
 		}
 	}
 }
+
+// waitForSignal Waits (blocking) for the program to be interrupted by the OS
+func waitForSignal() {
+	var sigCh = make(chan os.Signal, 1)
+	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
+	<-sigCh
+	close(sigCh)
+}
diff --git a/pndpd.conf b/pndpd.conf
index 9eb03b2..f15083f 100644
--- a/pndpd.conf
+++ b/pndpd.conf
@@ -13,7 +13,7 @@ responder {
 }
 
 // Proxy example
-// Create an NDP proxy that for proxying NDP between iface1 ("eth0") and iface2 ("eth1")
+// Create an NDP proxy for proxying NDP between iface1 ("eth0") and iface2 ("eth1")
 // The whitelist is applied on iface2
 proxy {
     iface1 eth0