diff --git a/Makefile b/Makefile
index c646f54..575230f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@
 CGROUP	= nofiles
 
 
-CC=gcc
-CFLAGS=-c -g -Wall -O3
+# CC=gcc
+CFLAGS=-c -g -Wall -O3 -DSYSLOG
 HT_CFLAGS=-Wall -O3 `cat getpass.def`
-LD=gcc
+LD=${CC}
 LDFLAGS=-g -o ${TARGET}
 
 all: cmd5apoppw ht
@@ -24,7 +24,7 @@
 	${LD} ${LDFLAGS} ${OBJS} 
 
 ht:	ht.c base64.o md5.o getpass.def
-	gcc ${HT_CFLAGS} -o ht ht.c base64.o md5.o
+	${CC} ${HT_CFLAGS} -o ht ht.c base64.o md5.o
 
 clean:
 	rm -f ${OBJS} ${CODEOBJS} ${GENOBJS} ${TARGET} *~ core cmd5apoppw ht
diff --git a/main.c b/main.c
index 0508a0a..187131a 100644
--- a/main.c
+++ b/main.c
@@ -9,6 +9,11 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
+#if defined(SYSLOG)
+#include <syslog.h>
+#define ENV_REMOTEHOST	"TCPREMOTEHOST"
+#define ENV_REMOTEIP	"TCPREMOTEIP"
+#endif
 
 #ifndef LINE_MAX
 #define LINE_MAX 256
@@ -436,9 +441,16 @@
   accepted=doit(login, response, challenge);
 #endif
   
+#if defined(SYSLOG) && defined(LOG_MAIL)
+    syslog(LOG_INFO|LOG_MAIL, "Auth %s user=%s host=%s remoteip=%s",
+           accepted ? "FAIL" : "success",
+           login,
+           getenv(ENV_REMOTEHOST) ? getenv(ENV_REMOTEHOST) :"unknown",
+           getenv(ENV_REMOTEIP) ? getenv(ENV_REMOTEIP) :"unknownIP");
+#endif
   for (i = 0;i < sizeof(up);++i) up[i] = 0;
  
-  if (accepted)  _exit(1);
-    execvp(argv[1], argv + 1);
-    _exit(111);
+  if (accepted) _exit(1);
+  execvp(argv[1], argv + 1);
+  _exit(111);
 }