diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e4f81c..425070e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,8 @@ tde_setup_paths( )
 
 ##### optional stuff ############################
 
-
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 
 
 ##### user requested modules #####
diff --git a/config.h.cmake b/config.h.cmake
index a506c78..47cd0c7 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,4 +1,7 @@
-#cmakedefine VERSION "@VERSION@"
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
@@ -285,9 +288,6 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME 1
 
-/* Version number of package */
-#define VERSION "3.5.10"
-
 /* Defined if compiling without arts */
 /* #undef WITHOUT_ARTS */
 
@@ -451,10 +451,6 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
 #endif
 
 
-/* define to 1 if -fvisibility is supported */
-/* #undef __KDE_HAVE_GCC_VISIBILITY */
-
-
 #if defined(__SVR4) && !defined(__svr4__)
 #define __svr4__ 1
 #endif