diff --git a/demo/Makefile b/demo/Makefile
index fbe132f682815a5ad192858226fbaff9818846bb..fed9b7c4023c3d2413596a9729a1067aecf4547d 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -23,7 +23,7 @@ MPCCI_DIR =
 
 
 # ============================================================================
-#                 !!! Do not edit the file after this line !!!
+#                 !!! Do not edit after this line !!!
 # ============================================================================
 
 
@@ -53,15 +53,18 @@ PNG_LIB = -lpng
 
 UMFPACK_LIB = -L$(AMDIS_DIR)/lib/AMD/Lib -L$(AMDIS_DIR)/lib/UMFPACK/Lib
 ifeq ($(strip $(USE_SERVER)), mars)
-	UMFPACK_LIB += -lmkl
+	UMFPACK_LIB += -lmkl -lumfpack -lamd
 else
 	ifeq ($(strip $(USE_SERVER)), themisto)
-		UMFPACK_LIB += $(MKL_LIB) -lmkl -lguide -lpthread
+		UMFPACK_LIB += $(MKL_LIB) -lmkl -lguide -lpthread -lumfpack -lamd
 	else	
-		UMFPACK_LIB += -lblas
+		ifeq ($(strip $(USE_SERVER)), deimos)
+			UMFPACK_LIB += -lumfpack -lamd -L/licsoft/libraries/goto -lgoto -lpthread
+		else
+			UMFPACK_LIB += -lblas -lumfpack -lamd
+		endif
 	endif
 endif
-UMFPACK_LIB += -lumfpack -lamd
 
 SMI_LIB = -L$(SMI_DIR)/lib -lsmi
 MPCCI_LIB = -L$(MPCCI_DIR)/lib/linux-x86-glibc22 -lmpcci