diff --git a/contrib/spoa_server/Makefile b/contrib/spoa_server/Makefile
index f075282..e7b20db 100644
--- a/contrib/spoa_server/Makefile
+++ b/contrib/spoa_server/Makefile
@@ -23,10 +23,47 @@
 
 ifneq ($(USE_PYTHON),)
 OBJS += ps_python.o
+
+# "--embed" flag is supported (and required) only from python 3.8+
+check_python_config := $(shell if python3-config --embed; then echo "python3.8+"; \
+elif hash python3-config; then echo "python3"; \
+elif hash python-config; then echo "python2"; fi)
+
+ifeq ($(check_python_config), python3.8+)
+PYTHON_DEFAULT_INC := $(shell python3-config --includes)
+PYTHON_DEFAULT_LIB := $(shell python3-config --libs --embed)
+else ifeq ($(check_python_config), python3)
+PYTHON_DEFAULT_INC := $(shell python3-config --includes)
+PYTHON_DEFAULT_LIB := $(shell python3-config --libs)
+else ifeq ($(check_python_config), python2)
+PYTHON_DEFAULT_INC := $(shell python-config --includes)
+PYTHON_DEFAULT_LIB := $(shell python-config --libs)
+endif
+
+
+# Add default path
+ifneq ($(PYTHON_DEFAULT_INC),)
+CFLAGS += $(PYTHON_DEFAULT_INC)
+else
 CFLAGS += -I/usr/include/python2.7
+endif
+ifneq ($(PYTHON_DEFAULT_LIB),)
+LDLIBS += $(PYTHON_DEFAULT_LIB)
+else
 LDLIBS += -lpython2.7
 endif
 
+# Add user additional paths if any
+ifneq ($(PYTHON_INC),)
+CFLAGS += -I$(PYTHON_INC)
+endif
+ifneq ($(PYTHON_LIB),)
+LDLIBS += -L$(PYTHON_LIB)
+endif
+
+LDLIBS +=-Wl,--export-dynamic
+endif
+
 spoa: $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)