diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4d11ac16..a84947806 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,6 +129,7 @@ option( BUILD_KXKB "Build kxkb"  ${BUILD_ALL} )
 option( BUILD_TSAK "Build tsak"  ${BUILD_ALL} )
 option( BUILD_KROOTBACKING "Build krootbacking"  ${BUILD_ALL} )
 option( BUILD_TQT3INTEGRATION "Build tqt3integration"  ${BUILD_ALL} )
+option( BUILD_CRASHTEST "Build crash test program"  ${BUILD_ALL} )
 
 
 ##### set PKG_CONFIG_PATH #######################
diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt
index 3fa8f67f0..db2883745 100644
--- a/drkonqi/CMakeLists.txt
+++ b/drkonqi/CMakeLists.txt
@@ -34,3 +34,14 @@ tde_add_executable( drkonqi AUTOMOC
   LINK kio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
+
+##### crashtest (executable) ######################
+
+if( BUILD_CRASHTEST )
+  tde_add_executable( crashtest AUTOMOC
+    SOURCES
+      crashtest.cpp
+    LINK kio-shared
+    DESTINATION ${BIN_INSTALL_DIR}
+  )
+endif( BUILD_CRASHTEST )
diff --git a/drkonqi/Makefile.am b/drkonqi/Makefile.am
index ad04f8132..a07f140d0 100644
--- a/drkonqi/Makefile.am
+++ b/drkonqi/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 
 EXTRA_DIST = LICENSE
 
-bin_PROGRAMS = drkonqi
+bin_PROGRAMS = drkonqi crashtest
 
 # Libraries:
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor