--- /dev/null
+diff -ruaN xmail-1.24.orig/Makefile.lnx xmail-1.24/Makefile.lnx
+--- xmail-1.24.orig/Makefile.lnx 2006-12-31 20:03:59.000000000 +0100
++++ xmail-1.24/Makefile.lnx 2007-02-02 13:11:29.000000000 +0100
+@@ -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)