diff --git a/mozilla/toolkit/library/libxul-config.mk b/mozilla/toolkit/library/libxul-config.mk
index 5ab27a0c86b..5ae9e725acf 100644
--- a/mozilla/toolkit/library/libxul-config.mk
+++ b/mozilla/toolkit/library/libxul-config.mk
@@ -200,11 +200,14 @@ endif
 endif
 endif
 
+ifdef MOZ_STORAGE
+COMPONENT_LIBS += storagecomps
+endif
+
 ifdef MOZ_PLACES
 STATIC_LIBS += morkreader_s
 
 COMPONENT_LIBS += \
-	storagecomps \
 	places \
 	$(NULL)
 else