diff --git a/.editorconfig b/.editorconfig
index 67ce9503..d0466b2f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,7 @@ insert_final_newline = true
 [*.py]
 indent_style = space
 indent_size = 4
+
+[*.am]
+indent_style = tab
+indent_size = 4
diff --git a/configure.ac b/configure.ac
index 821a2961..a1f0ad6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,11 +147,6 @@ if test "x$enable_daemon" = "xyes" ; then
   AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH)
 fi
 
-AC_CHECK_PROG(pip_installed, pip, yes, no, $SEARCHPATH)
-if test "x$pip_installed" = "xno" ; then
-    AC_MSG_ERROR([Could not locate pip. Please install python-pip.])
-fi
-
 #AC_CHECK_PROG(dia, dia, yes, no)
 AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH)
 if test "x$convert" = "xno" ; then
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 2bbfc299..cf903a44 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -85,7 +85,12 @@ build:
 
 # Python package install
 install-exec-hook:
-	pip install .
+	$(MKDIR_P) ${DESTDIR}/${pythondir}
+	$(MKDIR_P) ${DESTDIR}/${pyexecdir}
+	PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
+		--prefix=${DESTDIR}/${pyprefix} \
+		--install-purelib=${DESTDIR}/${pythondir} \
+		--install-platlib=${DESTDIR}/${pyexecdir}
 
 install-data-local:
 	$(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR)
@@ -97,7 +102,7 @@ uninstall-local:
 
 # Python package uninstall
 uninstall-hook:
-	yes | pip uninstall core-python
+	rm -rf ${pythondir}/core_python-${COREDPY_VERSION}-py${PYTHON_VERSION}.egg-info
 	rm -f ${pythondir}/core_python_netns-1.0-py${PYTHON_VERSION}.egg-info
 	rm -rf ${pythondir}/core
 	rmdir -p $(coreexservicesdir) || true
diff --git a/daemon/ns3/Makefile.am b/daemon/ns3/Makefile.am
index 352c1d11..346daf5c 100644
--- a/daemon/ns3/Makefile.am
+++ b/daemon/ns3/Makefile.am
@@ -26,7 +26,13 @@ build:
 
 # Python package install
 install-exec-hook:
-	$(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install --prefix=${DESTDIR}/${pyprefix} --install-purelib=${DESTDIR}/${pythondir} --install-platlib=${DESTDIR}/${pyexecdir} --no-compile
+	$(MKDIR_P) ${DESTDIR}/${pythondir}
+	$(MKDIR_P) ${DESTDIR}/${pyexecdir}
+	PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
+		--prefix=${DESTDIR}/${pyprefix} \
+		--install-purelib=${DESTDIR}/${pythondir} \
+		--install-platlib=${DESTDIR}/${pyexecdir} \
+		--no-compile
 
 # Python package uninstall
 uninstall-hook:
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index 105c9944..0cec0814 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -8,6 +8,8 @@
 #
 
 AM_CFLAGS	= -Wall -fno-strict-aliasing -O3 -g @libev_CFLAGS@
+SETUPPY		= setup.py
+SETUPPYFLAGS	= -v
 # 				-DDEBUG
 
 SRC_COMMON	= vnode_msg.c vnode_cmd.c vnode_chnl.c vnode_io.c \
@@ -36,8 +38,13 @@ libnetns.a:
 
 # Python libraries install
 install-exec-local:
-	SBINDIR=${DESTDIR}/@SBINDIR@ $(PYTHON) setup.py install --prefix=${DESTDIR}/${pyprefix} --install-purelib=${DESTDIR}/${pythondir} --install-platlib=${DESTDIR}/${pyexecdir} --no-compile
-#python setup.py install --prefix=${DESTDIR}${PYTHON_PREFIX}
+	$(MKDIR_P) ${DESTDIR}/${pythondir}
+	$(MKDIR_P) ${DESTDIR}/${pyexecdir}
+	SBINDIR=${DESTDIR}/@SBINDIR@ PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
+		--prefix=${DESTDIR}/${pyprefix} \
+		--install-purelib=${DESTDIR}/${pythondir} \
+		--install-platlib=${DESTDIR}/${pyexecdir} \
+		--no-compile
 
 # Python libraries uninstall
 uninstall-hook: