diff --git a/configure.ac b/configure.ac
index a8fc8324..13bfa66d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,6 +406,9 @@ AC_ARG_WITH([theme],
                     with_theme="default/default.theme")
 AC_DEFINE_UNQUOTED([CONFIG_DEFAULT_THEME],
                    "${with_theme}",[Name of default theme])
+AC_ARG_WITH([xterm],
+    AC_HELP_STRING([--with-xterm=xterm],[Default X11 terminal emulator for X11]),
+    [AC_DEFINE_UNQUOTED([XTERMCMD],"$with_xterm",[Name of terminal emulator.])])
 
 AC_DEFINE_UNQUOTED([HOSTOS],["${host_os}"],
 	[Define to the host operating system.])
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88227162..40a28e35 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,6 +81,7 @@ IF("" STREQUAL "${CONFIG_UNICODE_SET}")
 ELSE()
     MESSAGE(STATUS "Configured custom unicode set: ${CONFIG_UNICODE_SET}.")
 ENDIF()
+SET(XTERMCMD "" CACHE STRING "Default terminal emulator for X11")
 
 # TODO: find some common helper to handle that variables
 if(ENABLE_NLS OR CONFIG_I18N)
@@ -523,7 +524,6 @@ foreach (_variableName
         CONFIG_XPM
         CONFIG_LIBJPEG
         CONFIG_LIBPNG
-        CONFIG_RENDER
         CONFIG_XFREETYPE
         CONFIG_COREFONTS
         CONFIG_FRIBIDI
diff --git a/src/config.cmake.h.in b/src/config.cmake.h.in
index d43ccbc8..8ce3ee0d 100644
--- a/src/config.cmake.h.in
+++ b/src/config.cmake.h.in
@@ -119,6 +119,7 @@
 #cmakedefine XINERAMA 1
 #cmakedefine CONFIG_FRIBIDI 1
 #cmakedefine DEBUG 1
+#cmakedefine XTERMCMD @XTERMCMD@
 
 #define CONFIG_DEFAULT_THEME "@CONFIG_DEFAULT_THEME@"