diff --git a/apps/Makefile b/apps/Makefile
index 6e9032f6..10179897 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -70,7 +70,7 @@ BACNET_PORT ?= linux
 ifeq (${UCI},1)
 BACNET_DEFINES += -DBAC_UCI
 UCI_LIB_DIR ?= /usr/local/lib
-BACNET_LIB += -L$(UCI_LIB_DIR),-luci
+BACNET_LIB += -L$(UCI_LIB_DIR) -luci
 endif
 # OS specific builds
 ifeq (${BACNET_PORT},linux)
diff --git a/apps/lib/Makefile b/apps/lib/Makefile
index 713fa062..8278549f 100644
--- a/apps/lib/Makefile
+++ b/apps/lib/Makefile
@@ -100,6 +100,12 @@ BACNET_BASIC_SRC ?= \
 	$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
 	$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c
 
+# build in uci integration - use UCI=1 when invoking make
+ifeq (${UCI},1)
+BACNET_BASIC_SRC += \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/ucix/*.c)
+endif
+
 SRCS := $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
 
 OBJS = ${SRCS:.c=.o}