diff --git a/lib/freeDiameter-1.2.1/Makefile.am b/lib/freeDiameter-1.2.1/Makefile.am
index 7b09d3745..f570d75db 100644
--- a/lib/freeDiameter-1.2.1/Makefile.am
+++ b/lib/freeDiameter-1.2.1/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libfdcore
+SUBDIRS = libfdcore libfdproto
 
 MAINTAINERCLEANFILES = \
     configure config.in \
@@ -12,5 +12,6 @@ MAINTAINERCLEANFILES = \
 	build-aux/ltmain.sh build-aux/test-driver build-aux/compile \
 	build-aux/config.sub build-aux/missing build-aux/install-sh \
 	build-aux/ylwrap include/freeDiameter/freeDiameter-host.hin* \
-    Makefile.in
+    Makefile.in \
+	include/freeDiameter/version.h libfdcore/fdd.tab.y libfdcore/lex.fdd.l
 MOSTLYCLEANFILES = core *.stackdump
diff --git a/lib/freeDiameter-1.2.1/configure.ac b/lib/freeDiameter-1.2.1/configure.ac
index 78054ca60..6bd6e98c3 100644
--- a/lib/freeDiameter-1.2.1/configure.ac
+++ b/lib/freeDiameter-1.2.1/configure.ac
@@ -20,6 +20,16 @@ AC_PREREQ(2.63)
 # Where to generate output; srcdir location.
 AC_CONFIG_HEADERS([include/freeDiameter/freeDiameter-host.h:include/freeDiameter/freeDiameter-host.hin])dnl Keep filename to 8.3 for MS-DOS.
 AC_CANONICAL_HOST
+case $host in
+    *linux*)
+        ;;
+    *-apple-darwin*)
+        AC_DEFINE_UNQUOTED([DISABLE_SCTP],
+                [1], [Disable SCTP])
+        ;;
+    *)
+        ;;
+esac
 
 AH_TOP([
 #ifndef FD_IS_CONFIG
@@ -69,6 +79,10 @@ AC_C_BIGENDIAN
 #############################
 #### From FreeDiameter CMAKE 
 #############################
+touch include/freeDiameter/version.h
+ln -s fdd.y libfdcore/fdd.tab.y
+ln -s fdd.l libfdcore/lex.fdd.l
+
 AC_DEFINE_UNQUOTED([FD_PROJECT_BINARY],
         ["freeDiameterd"], [Project Binary])
 AC_DEFINE_UNQUOTED([FD_PROJECT_NAME],
@@ -133,6 +147,7 @@ AC_CHECK_LIB([gnutls], [gnutls_handshake_set_timeout],
 #####################
 
 AC_CONFIG_FILES([libfdcore/Makefile])
+AC_CONFIG_FILES([libfdproto/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
diff --git a/lib/freeDiameter-1.2.1/libfdcore/Makefile.am b/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
index 886053e59..78dc481b8 100644
--- a/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
+++ b/lib/freeDiameter-1.2.1/libfdcore/Makefile.am
@@ -3,6 +3,7 @@
 noinst_LTLIBRARIES = libfdcore.la
 
 libfdcore_la_SOURCES = \
+	fdcore-internal.h \
 	apps.c cnxctx.h config.c core.c cnxctx.c endpoints.c events.c \
 	extensions.c fifo_stats.c hooks.c dict_base_proto.c messages.c \
 	queues.c peers.c p_ce.c p_cnx.c p_dw.c p_dp.c p_expiry.c \
@@ -18,5 +19,5 @@ AM_CPPFLAGS = \
 AM_CFLAGS = \
 	-Wall -Werror -Wno-unused-variable
 
-MAINTAINERCLEANFILES = fdd.c Makefile.in 
+MAINTAINERCLEANFILES = version.h fdd.c Makefile.in
 MOSTLYCLEANFILES = *.stackdump
diff --git a/lib/freeDiameter-1.2.1/libfdcore/fdd.tab.y b/lib/freeDiameter-1.2.1/libfdcore/fdd.tab.y
deleted file mode 120000
index e185c1e17..000000000
--- a/lib/freeDiameter-1.2.1/libfdcore/fdd.tab.y
+++ /dev/null
@@ -1 +0,0 @@
-fdd.y
\ No newline at end of file
diff --git a/lib/freeDiameter-1.2.1/libfdcore/lex.fdd.l b/lib/freeDiameter-1.2.1/libfdcore/lex.fdd.l
deleted file mode 120000
index 254071117..000000000
--- a/lib/freeDiameter-1.2.1/libfdcore/lex.fdd.l
+++ /dev/null
@@ -1 +0,0 @@
-fdd.l
\ No newline at end of file
diff --git a/lib/freeDiameter-1.2.1/libfdproto/Makefile.am b/lib/freeDiameter-1.2.1/libfdproto/Makefile.am
new file mode 100644
index 000000000..d7447acca
--- /dev/null
+++ b/lib/freeDiameter-1.2.1/libfdproto/Makefile.am
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+noinst_LTLIBRARIES = libfdproto.la
+
+libfdproto_la_SOURCES = \
+	fdproto-internal.h \
+	dictionary.c dictionary_functions.c dispatch.c fifo.c init.c \
+	lists.c log.c messages.c ostr.c portability.c rt_data.c \
+	sessions.c utils.c version.c
+
+AM_CPPFLAGS = \
+    -I$(top_srcdir)/include
+
+AM_CFLAGS = \
+	-Wall -Werror -Wno-unused-variable
+
+MAINTAINERCLEANFILES = Makefile.in
+MOSTLYCLEANFILES = *.stackdump