diff --git a/.gitignore b/.gitignore
index 1bef527..5e1f1b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ CMakeFiles/
 cmake_install.cmake
 CMakeCache.txt
 libmiracle-shared.a
+install_manifest.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffbe32c..60e2969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,27 @@
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake
-                      ${CMAKE_MODULE_PATH})
-
-set(CMAKE_C_FLAGS "-std=gnu11")
-add_definitions(-D_GNU_SOURCE)
-
-project(Miraclecast)
 cmake_minimum_required(VERSION 3.0)
-
-add_subdirectory(src)
-add_subdirectory(res)
-add_subdirectory(test)
-
-SET(BUILD_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
-OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON )
-OPTION(RELY_UDEV "Rely in udev tag to select device" OFF )
-OPTION(BUILD_TESTS "Enable TEST" ON )
+project(Miraclecast)
 
 SET(PACKAGE_NAME miraclecast)
 SET(PACKAGE_VERSION 1)
 SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
+                      ${CMAKE_MODULE_PATH})
+
+set(CMAKE_C_FLAGS "-std=gnu11 ${CMAKE_C_FLAGS}")
+add_definitions(-D_GNU_SOURCE)
+
+OPTION(BUILD_ENABLE_DEBUG "Enable Debug" ON )
+OPTION(RELY_UDEV "Rely in udev tag to select device" OFF )
+OPTION(BUILD_TESTS "Enable TEST" ON )
+
 find_package(PkgConfig)
 pkg_check_modules (GLIB2 REQUIRED glib-2.0)
 pkg_check_modules (UDEV REQUIRED libudev)
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+
+add_subdirectory(src)
+add_subdirectory(res)
+add_subdirectory(test)
 
diff --git a/common.am b/common.am
index 89b0ff1..1bd9b78 100644
--- a/common.am
+++ b/common.am
@@ -10,8 +10,7 @@ AM_CFLAGS = -Wall \
 
 AM_CPPFLAGS = -include $(top_builddir)/config.h \
 	-I $(top_srcdir)/src \
-	-I $(top_srcdir)/src/shared \
-	'-DBUILD_BINDIR="$(bindir)"'
+	-I $(top_srcdir)/src/shared
 
 AM_LDFLAGS = -Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/src/ctl/ctl.h b/src/ctl/ctl.h
index 40e49ec..8062f0c 100644
--- a/src/ctl/ctl.h
+++ b/src/ctl/ctl.h
@@ -186,6 +186,7 @@ void cli_printf(const char *fmt, ...);
 #define CLI_BLUE		"\x1B[0;94m"
 #define CLI_BOLDGRAY		"\x1B[1;30m"
 #define CLI_BOLDWHITE		"\x1B[1;37m"
+
 #define CLI_PROMPT		CLI_BLUE "[miraclectl] # " CLI_DEFAULT
 
 struct cli_cmd {
diff --git a/src/ctl/sinkctl.c b/src/ctl/sinkctl.c
index 24d461e..e71ea7c 100644
--- a/src/ctl/sinkctl.c
+++ b/src/ctl/sinkctl.c
@@ -369,7 +369,7 @@ static void spawn_gst(int hres, int vres)
 		}
 
 		i = 0;
-		argv[i++] = (char*) BUILD_BINDIR "/miracle-gst.sh";
+		argv[i++] = (char*) "/miracle-gst.sh";
 		if (cli_max_sev >= 7)
 			argv[i++] = "-d 3";
 		if (gst_audio_en)
diff --git a/src/wifi/wifid-supplicant.c b/src/wifi/wifid-supplicant.c
index f467b47..e05a0cc 100644
--- a/src/wifi/wifid-supplicant.c
+++ b/src/wifi/wifid-supplicant.c
@@ -386,7 +386,7 @@ static int supplicant_group_spawn_dhcp_server(struct supplicant_group *g,
 		}
 
 		i = 0;
-		argv[i++] = (char*) BUILD_BINDIR "/miracle-dhcp";
+		argv[i++] = (char*) "miracle-dhcp";
 		argv[i++] = "--server";
 		argv[i++] = "--prefix";
 		argv[i++] = prefix;
@@ -398,7 +398,9 @@ static int supplicant_group_spawn_dhcp_server(struct supplicant_group *g,
 		argv[i++] = commfd;
 		argv[i] = NULL;
 
-		execve(argv[0], argv, environ);
+		if (execvpe(argv[0], argv, environ)< 0) {
+			log_error("dhcp failed (%d): %m", errno);
+		}
 		_exit(1);
 	}
 
@@ -448,7 +450,7 @@ static int supplicant_group_spawn_dhcp_client(struct supplicant_group *g)
 		}
 
 		i = 0;
-		argv[i++] = (char*) BUILD_BINDIR "/miracle-dhcp";
+		argv[i++] = (char*) "miracle-dhcp";
 		argv[i++] = "--log-level";
 		argv[i++] = loglevel;
 		argv[i++] = "--netdev";
@@ -457,7 +459,9 @@ static int supplicant_group_spawn_dhcp_client(struct supplicant_group *g)
 		argv[i++] = commfd;
 		argv[i] = NULL;
 
-		execve(argv[0], argv, environ);
+		if (execvpe(argv[0], argv, environ) < 0) {
+			log_error("dhcp failed (%d): %m", errno);
+		}
 		_exit(1);
 	}