diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in
index 904c805404..4ea9697168 100644
--- a/package/libvncserver/Config.in
+++ b/package/libvncserver/Config.in
@@ -26,6 +26,11 @@ config BR2_PACKAGE_LIBVNCSERVER_WEBSOCKETS
 	help
 	  Enable WebSocket support (e.g. for noVNC)
 
+config BR2_PACKAGE_LIBVNCSERVER_INSTALL_STOREPASSSWD
+	bool "storepasswd tool"
+	help
+	  Install storepasswd tool used to create VNC passwords
+
 endif
 
 comment "libvncserver needs a toolchain w/ dynamic library"
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 9935a32dda..1180fc8dc7 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -15,7 +15,6 @@ LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON
 
 # only used for examples
 LIBVNCSERVER_CONF_OPTS += \
-	-DWITH_EXAMPLES=OFF \
 	-DWITH_FFMPEG=OFF \
 	-DWITH_GTK=OFF \
 	-DWITH_SDL=OFF \
@@ -90,4 +89,16 @@ else
 LIBVNCSERVER_CONF_OPTS += -DWITH_WEBSOCKETS=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_LIBVNCSERVER_INSTALL_STOREPASSSWD),y)
+LIBVNCSERVER_CONF_OPTS += -DWITH_EXAMPLES=ON
+define LIBVNCSERVER_INSTALL_STOREPASSWD
+	$(INSTALL) -D -m 0755 $(@D)/examples/server/storepasswd \
+		$(TARGET_DIR)/usr/bin/storepasswd
+endef
+
+LIBVNCSERVER_POST_INSTALL_TARGET_HOOKS += LIBVNCSERVER_INSTALL_STOREPASSWD
+else
+LIBVNCSERVER_CONF_OPTS += -DWITH_EXAMPLES=OFF
+endif
+
 $(eval $(cmake-package))