diff --git a/configure.ac b/configure.ac
index e4dc828a..3d15576b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ case $host_os in
   ;;
   *darwin*)
     bsd=true
+    darwin=true
     AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
   ;;
   *solaris*)
@@ -120,6 +121,7 @@ AC_ARG_WITH(windows2000,
 
 AM_CONDITIONAL(LINUX, test "$linux" = true)
 AM_CONDITIONAL(BSD, test "$bsd" = true)
+AM_CONDITIONAL(DARWIN, test "$darwin" = true)
 AM_CONDITIONAL(SOLARIS, test "$solaris" = true)
 AM_CONDITIONAL(MINGW, test "$mingw" = true)
 AM_CONDITIONAL(CYGWIN, test "$cygwin" = true)
diff --git a/src/Makefile.am b/src/Makefile.am
index b2b4b013..1233767d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,11 +36,12 @@ libed25519_la_SOURCES = \
 	ed25519/verify.c
 
 libtincconf_la_SOURCES = \
-	conf.h
+	conf.h\
+	conf.c
 
 libtincd_la_SOURCES = \
-  conf.h \
-  conf.c \
+	conf.h \
+	conf.c \
 	buffer.c buffer.h \
 	cipher.h \
 	connection.c connection.h \
@@ -185,9 +186,15 @@ sptps_speed_SOURCES = \
 
 tincd_LDADD = libtincd.la libed25519.la libchacha_poly1305.la libtincconf.la
 tinc_LDADD = $(READLINE_LIBS) $(CURSES_LIBS) libtincd.la libtincconf.la libed25519.la libchacha_poly1305.la
-sptps_speed_LDADD = -lrt libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
-sptps_test_LDADD = -lrt libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
-sptps_keypair_LDADD = -lrt libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la
+sptps_speed_LDADD = libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
+sptps_test_LDADD = libtincd.la libed25519.la libtincconf.la libchacha_poly1305.la
+sptps_keypair_LDADD = libed25519.la libtincconf.la libchacha_poly1305.la libtincd.la
+
+if !DARWIN
+sptps_speed_LDADD += -lrt
+sptps_test_LDADD += -lrt
+sptps_keypair_LDADD += -lrt
+endif
 
 LIBS = @LIBS@ -lm