diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index dad52d1b0..652412cb0 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -193,6 +193,14 @@ PROD_OBJS+=$(PROD_OBJS_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(USR_OBJS_$(OS_CLASS))),)
+USR_OBJS+=$(subst -nil-,,$(USR_OBJS_$(OS_CLASS)))
+else
+ifneq (,$(strip $(USR_OBJS_DEFAULT)))
+USR_OBJS+=$(USR_OBJS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(OBJS_$(OS_CLASS))),)
 OBJS+=$(subst -nil-,,$(OBJS_$(OS_CLASS)))
 else
diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index 8f1e0a41f..357dc8a9d 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -142,10 +142,10 @@ JAR =
 
 TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS)))
 
-PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(PROD_OBJS)))
+PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
 PROD_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(PRODUCT_OBJS)
 
-LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(LIB_OBJS)))
+LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
 LIBRARY_LD_OBJS = $(LDOBJS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------