diff --git a/lib/freeDiameter-1.2.1/configure.ac b/lib/freeDiameter-1.2.1/configure.ac
index de7c45777..b59177be4 100644
--- a/lib/freeDiameter-1.2.1/configure.ac
+++ b/lib/freeDiameter-1.2.1/configure.ac
@@ -22,14 +22,17 @@ AC_CONFIG_HEADERS([include/freeDiameter/config.h])
 AC_CANONICAL_HOST
 case $host in
     *linux*)
+        sctp=true;
         ;;
     *-apple-darwin*)
         AC_DEFINE_UNQUOTED([DISABLE_SCTP],
                 [1], [Disable SCTP])
+        sctp=false;
         ;;
     *)
         ;;
 esac
+AM_CONDITIONAL([SCTP], [test x$sctp = xtrue])
 
 AH_TOP([
 #ifndef FD_IS_CONFIG
diff --git a/lib/freeDiameter-1.2.1/libfdcore/Makefile.am b/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
index f09b3e1dd..525eb3b79 100644
--- a/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
+++ b/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
@@ -10,6 +10,10 @@ libfdcore_la_SOURCES = \
 	p_out.c p_psm.c p_sr.c routing_dispatch.c server.c tcp.c \
 	fdd.tab.y lex.fdd.l version.c
 
+if SCTP
+libfdcore_la_SOURCES += sctp.c sctp3436.c
+endif
+
 AM_YFLAGS = -p fdd -d
 AM_LFLAGS = -p -Cem -Pfdd