diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile
index 7d9a96b8..b8f12c74 100644
--- a/bacnet-stack/lib/Makefile
+++ b/bacnet-stack/lib/Makefile
@@ -40,7 +40,8 @@ CORE_SRC = \
 	$(BACNET_CORE)/awf.c \
 	$(BACNET_CORE)/cov.c \
 	$(BACNET_CORE)/dcc.c \
-	$(BACNET_CORE)/iam/iam.c \
+	$(BACNET_CORE)/iam/iam_client.c \
+	$(BACNET_CORE)/iam/iam_server.c \
 	$(BACNET_CORE)/ihave.c \
 	$(BACNET_CORE)/rd.c \
 	$(BACNET_CORE)/rp.c \
diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32
index fd9f5ea1..a622f2d4 100644
--- a/bacnet-stack/lib/makefile.b32
+++ b/bacnet-stack/lib/makefile.b32
@@ -59,7 +59,8 @@ CORE2_SRC = $(BACNET_CORE)\arf.c \
 	$(BACNET_CORE)\awf.c \
 	$(BACNET_CORE)\cov.c \
 	$(BACNET_CORE)\dcc.c \
-	$(BACNET_CORE)\iam\iam.c \
+	$(BACNET_CORE)\iam\iam_client.c \
+	$(BACNET_CORE)\iam\iam_server.c \
 	$(BACNET_CORE)\ihave.c \
 	$(BACNET_CORE)\rd.c \
 	$(BACNET_CORE)\rp.c \
diff --git a/bacnet-stack/src/iam/iam.mak b/bacnet-stack/src/iam/Makefile
similarity index 89%
rename from bacnet-stack/src/iam/iam.mak
rename to bacnet-stack/src/iam/Makefile
index 2d84ec1c..7b900a40 100755
--- a/bacnet-stack/src/iam/iam.mak
+++ b/bacnet-stack/src/iam/Makefile
@@ -12,7 +12,9 @@ SRCS = ../bacdcode.c \
        ../npdu.c \
        ../apdu.c \
        ../dcc.c \
-       ../iam.c \
+       ../iam_client.c \
+       ../iam_server.c \
+       ../iam_test.c \
        ../../test/ctest.c
 
 OBJS = ${SRCS:.c=.o}