diff --git a/features.in/x11-vnc/README b/features.in/x11-vnc/README
new file mode 100644
index 00000000..2f424ae8
--- /dev/null
+++ b/features.in/x11-vnc/README
@@ -0,0 +1,4 @@
+This feature allows to use X11 through VNC server.  It adds x11vnc package and
+sets default password to alt.  Another thing is that this feature adds dummy
+video adapter configuration to the /etc/X11/xorg.conf.d/. x11vnc becomes
+default service.
diff --git a/features.in/x11-vnc/config.mk b/features.in/x11-vnc/config.mk
new file mode 100644
index 00000000..40d62774
--- /dev/null
+++ b/features.in/x11-vnc/config.mk
@@ -0,0 +1,4 @@
+use/x11-vnc:
+	@$(call add,THE_PACKAGES,x11vnc x11vnc-service xorg-drv-dummy)
+	@$(call add,DEFAULT_SERVICES_ENABLE,x11vnc)
+	@$(call add_feature)
diff --git a/features.in/x11-vnc/rootfs/image-scripts.d/51-x11-vnc b/features.in/x11-vnc/rootfs/image-scripts.d/51-x11-vnc
new file mode 100755
index 00000000..ccbf9550
--- /dev/null
+++ b/features.in/x11-vnc/rootfs/image-scripts.d/51-x11-vnc
@@ -0,0 +1,35 @@
+#!/bin/sh
+# setup X11 to use it with a VNC
+
+CFG=/root/.vnc/
+
+[ -d "$CFG" ] || mkdir -p "$CFG"
+
+x11vnc -storepasswd alt "$CFG"/passwd
+
+cat > /etc/X11/xorg.conf.d/51-dummy.conf << EOF
+Section "Device"
+    Identifier "Configured Video Device"
+    Driver "dummy"
+    VideoRam 16384
+EndSection
+
+Section "Monitor"
+    Identifier "Configured Monitor"
+    HorizSync 5.0 - 1000.0
+    VertRefresh 5.0 - 200.0
+EndSection
+
+Section "Screen"
+    Identifier "Default Screen"
+    Monitor "Configured Monitor"
+    Device "Configured Video Device"
+    DefaultDepth 24
+    SubSection "Display"
+        Viewport 0 0
+        Depth 24
+        Virtual 1024 768
+    EndSubSection
+EndSection
+
+EOF