diff --git a/.gitignore b/.gitignore
index 1c16f83c..57357576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.sock
 *.pyc
 rules
-daemon/daemon
diff --git a/Makefile b/Makefile
index 95101712..38c78bb6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-all: protocol daemon/daemon ui/resources_rc.py
+all: protocol daemon/opensnitchd ui/resources_rc.py
 
 protocol:
 	@cd proto && make
 
-daemon/daemon:
+daemon/opensnitchd:
 	@cd daemon && make
 
 ui/resources_rc.py:
@@ -27,7 +27,7 @@ test:
 	clear
 	cd ui && sudo pip install --upgrade . && cd ..
 	opensnitch-ui --socket unix:///tmp/osui.sock &
-	sudo ./daemon/daemon -ui-socket unix:///tmp/osui.sock
+	sudo ./daemon/opensnitchd -ui-socket unix:///tmp/osui.sock
 
 adblocker:
 	clear 
@@ -39,6 +39,6 @@ adblocker:
 	clear
 	cd ui && sudo pip install --upgrade . && cd ..
 	opensnitch-ui --socket unix:///tmp/osui.sock &
-	sudo ./daemon/daemon -ui-socket unix:///tmp/osui.sock
+	sudo ./daemon/opensnitchd -ui-socket unix:///tmp/osui.sock
 
 
diff --git a/README.md b/README.md
index 98e79824..8365b4da 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ iptables rules and so on, in order to compile it you will need to install the `p
 packages on your system, then just:
 
     cd daemon
-    go build .
+    make
 
 ### Qt5 UI
 
@@ -47,7 +47,7 @@ First, you need to decide in which folder opensnitch rules will be saved, it is
 
 Now run the daemon:
 
-    sudo /path/to/daemon -ui-socket unix:///tmp/osui.sock -rules-path ~/.opensnitch/rules
+    sudo /path/to/opensnitchd -ui-socket unix:///tmp/osui.sock -rules-path ~/.opensnitch/rules
 
 And the UI service as your user (make sure you installed the UI with pip as in the previous section):
 
diff --git a/daemon/.gitignore b/daemon/.gitignore
index 624a944c..ac086216 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -1,2 +1,2 @@
-./daemon
+opensnitchd
 vendor
diff --git a/daemon/Makefile b/daemon/Makefile
index 9e5de5d7..ad0c4394 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -1,10 +1,10 @@
-all: daemon
+all: opensnitchd
 
 deps: 
 	@glide up
 
-daemon:
-	@go build .
+opensnitchd:
+	@go build -o opensnitchd . 
 
 clean:
-	@rm -rf daemon
+	@rm -rf opensnitchd