--- a/Makefile.lnx
+++ b/Makefile.lnx
@@ -19,9 +19,9 @@
 #  Davide Libenzi <davidel@xmailserver.org>
 #
 SYSTYPE = linux
-CC = g++
-LD = g++
-STRIP = strip
+CC = $(CXX)
+LD = $(CXX)
+#STRIP = strip
 
 ifneq ("$(WITH_SSL_INCLUDE)", "")
     CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE)
