diff --git a/package/multimedia/live555/live555.mk b/package/multimedia/live555/live555.mk
index 0051ea0684..9e0ef14bdd 100644
--- a/package/multimedia/live555/live555.mk
+++ b/package/multimedia/live555/live555.mk
@@ -7,6 +7,7 @@
 LIVE555_VERSION = 2011.06.16
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
 LIVE555_SITE = http://www.live555.com/liveMedia/public/
+LIVE555_INSTALL_STAGING = YES
 LIVE555_INSTALL_TARGET = YES
 
 define LIVE555_CONFIGURE_CMDS
@@ -26,6 +27,18 @@ define LIVE555_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 endef
 
+LIVE555_HEADERS_TO_INSTALL = \
+	liveMedia/include \
+	groupsock/include \
+	UsageEnvironment/include \
+	BasicUsageEnvironment/include
+
+LIVE555_LIBS_TO_INSTALL = \
+	liveMedia/libliveMedia.a \
+	groupsock/libgroupsock.a \
+	UsageEnvironment/libUsageEnvironment.a \
+	BasicUsageEnvironment/libBasicUsageEnvironment.a
+
 LIVE555_FILES_TO_INSTALL- =
 LIVE555_FILES_TO_INSTALL-y =
 LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_OPENRTSP) += testProgs/openRTSP
@@ -33,12 +46,29 @@ LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MEDIASERVER) += mediaServer/live5
 LIVE555_FILES_TO_INSTALL-$(BR2_PACKAGE_LIVE555_MPEG2_INDEXER) += testProgs/MPEG2TransportStreamIndexer
 LIVE555_FILES_TO_INSTALL- += $(LIVE555_FILES_TO_INSTALL-y)
 
+define LIVE555_INSTALL_STAGING_CMDS
+	for i in $(LIVE555_HEADERS_TO_INSTALL); do \
+		mkdir -p $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+		cp -a $(@D)/$$i/* $(STAGING_DIR)/usr/include/live/`dirname $$i`; \
+	done; \
+	for i in $(LIVE555_LIBS_TO_INSTALL); do \
+		$(INSTALL) -D -m 0755 $(@D)/$$i $(STAGING_DIR)/usr/lib/`basename $$i`; \
+	done
+endef
+
 define LIVE555_INSTALL_TARGET_CMDS
 	for i in $(LIVE555_FILES_TO_INSTALL-y); do \
 		$(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/bin/`basename $$i`; \
 	done
 endef
 
+define LIVE555_UNINSTALL_STAGING_CMDS
+	rm -rf $(STAGING_DIR)/usr/include/live
+	for i in $(LIVE555_LIBS_TO_INSTALL); do \
+		rm -f $(addprefix $(STAGING_DIR)/usr/lib/, `basename $$i`); \
+	done
+endef
+
 define LIVE555_UNINSTALL_TARGET_CMDS
 	for i in $(LIVE555_FILES_TO_INSTALL-); do \
 		rm -f $(addprefix $(TARGET_DIR)/usr/bin/, `basename $$i`); \