diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81e3bb9d..0327e9b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -652,6 +652,7 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build.dir")
 # Install the executable.
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 install(DIRECTORY DSView/res DESTINATION share/DSView)
+install(DIRECTORY DSView/demo DESTINATION share/DSView)
 install(FILES DSView/icons/logo.svg DESTINATION share/DSView RENAME logo.svg)
 install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg)
 install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg)
@@ -675,7 +676,6 @@ install(FILES ug25.pdf DESTINATION share/DSView RENAME ug25.pdf)
 install(FILES ug31.pdf DESTINATION share/DSView RENAME ug31.pdf)
 
 install(DIRECTORY libsigrokdecode4DSL/decoders DESTINATION share/libsigrokdecode4DSL)
-install(DIRECTORY libsigrok4DSL/demo-file DESTINATION share/DSView)
 install(DIRECTORY lang DESTINATION share/DSView)
 
 #===============================================================================
diff --git a/libsigrok4DSL/demo-file/analog/demo_sawtooth_analog.dsl b/DSView/demo/analog/demo_sawtooth_analog.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/analog/demo_sawtooth_analog.dsl
rename to DSView/demo/analog/demo_sawtooth_analog.dsl
diff --git a/libsigrok4DSL/demo-file/analog/demo_sine_analog.dsl b/DSView/demo/analog/demo_sine_analog.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/analog/demo_sine_analog.dsl
rename to DSView/demo/analog/demo_sine_analog.dsl
diff --git a/libsigrok4DSL/demo-file/analog/demo_square_analog.dsl b/DSView/demo/analog/demo_square_analog.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/analog/demo_square_analog.dsl
rename to DSView/demo/analog/demo_square_analog.dsl
diff --git a/libsigrok4DSL/demo-file/analog/demo_triangle_analog.dsl b/DSView/demo/analog/demo_triangle_analog.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/analog/demo_triangle_analog.dsl
rename to DSView/demo/analog/demo_triangle_analog.dsl
diff --git a/libsigrok4DSL/demo-file/dso/demo_sawtooth_dso.dsl b/DSView/demo/dso/demo_sawtooth_dso.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/dso/demo_sawtooth_dso.dsl
rename to DSView/demo/dso/demo_sawtooth_dso.dsl
diff --git a/libsigrok4DSL/demo-file/dso/demo_sine_dso.dsl b/DSView/demo/dso/demo_sine_dso.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/dso/demo_sine_dso.dsl
rename to DSView/demo/dso/demo_sine_dso.dsl
diff --git a/libsigrok4DSL/demo-file/dso/demo_square_dso.dsl b/DSView/demo/dso/demo_square_dso.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/dso/demo_square_dso.dsl
rename to DSView/demo/dso/demo_square_dso.dsl
diff --git a/libsigrok4DSL/demo-file/dso/demo_triangle_dso.dsl b/DSView/demo/dso/demo_triangle_dso.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/dso/demo_triangle_dso.dsl
rename to DSView/demo/dso/demo_triangle_dso.dsl
diff --git a/libsigrok4DSL/demo-file/logic/demo_eeprom.dsl b/DSView/demo/logic/demo_eeprom.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/logic/demo_eeprom.dsl
rename to DSView/demo/logic/demo_eeprom.dsl
diff --git a/libsigrok4DSL/demo-file/logic/demo_spi.dsl b/DSView/demo/logic/demo_spi.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/logic/demo_spi.dsl
rename to DSView/demo/logic/demo_spi.dsl
diff --git a/libsigrok4DSL/demo-file/logic/demo_uart.dsl b/DSView/demo/logic/demo_uart.dsl
similarity index 100%
rename from libsigrok4DSL/demo-file/logic/demo_uart.dsl
rename to DSView/demo/logic/demo_uart.dsl