diff --git a/.gitignore b/.gitignore
index e56bbf257..cc98e1a28 100755
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ _CPack_Packages
 LICENSE.txt
 external/*
 !external/README
+include/freerdp/version.h
 
 *.a.objlist.cmake
 *.a.objlist
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5052f103..05af4336d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -462,6 +462,7 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/freerdp/extensions")
 
 # Include directories
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # Configure files
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index 19ea41010..5d4365a33 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -33,6 +33,7 @@
 #include <freerdp/locale/keyboard.h>
 
 #include <freerdp/client/cmdline.h>
+#include <freerdp/version.h>
 
 #include "compatibility.h"
 
diff --git a/config.h.in b/config.h.in
index d1eac49c1..839ec0da0 100755
--- a/config.h.in
+++ b/config.h.in
@@ -1,15 +1,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define FREERDP_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}
-#define FREERDP_VERSION_MINOR ${FREERDP_VERSION_MINOR}
-#define FREERDP_VERSION_REVISION ${FREERDP_VERSION_REVISION}
-#define FREERDP_VERSION_SUFFIX "${FREERDP_VERSION_SUFFIX}"
-#define FREERDP_API_VERSION "${FREERDP_API_VERSION}"
-#define FREERDP_VERSION "${FREERDP_VERSION}"
-#define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}"
-#define GIT_REVISION "${GIT_REVISION}"
-
 #define FREERDP_DATA_PATH "${FREERDP_DATA_PATH}"
 #define FREERDP_KEYMAP_PATH "${FREERDP_KEYMAP_PATH}"
 #define FREERDP_PLUGIN_PATH "${FREERDP_PLUGIN_PATH}"
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index ec64d17ac..5e06eaa0f 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -17,8 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
+
 file(GLOB FREERDP_HEADERS "freerdp/*.h")
 install(FILES ${FREERDP_HEADERS} DESTINATION include/freerdp COMPONENT headers)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h DESTINATION include/freerdp COMPONENT headers)
 
 install(DIRECTORY freerdp/cache DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY freerdp/codec DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h")
diff --git a/include/freerdp/version.h.in b/include/freerdp/version.h.in
new file mode 100644
index 000000000..e16fd0ce6
--- /dev/null
+++ b/include/freerdp/version.h.in
@@ -0,0 +1,32 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Version includes
+ *
+ * Copyright 2013 Thinstuff Technologies GmbH
+ * Copyright 2013 Bernhard Miklautz <bmiklautz@thinstuff.at>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef _FREERDP_VERSION_H_
+#define _FREERDP_VERSION_H_
+
+#define FREERDP_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}
+#define FREERDP_VERSION_MINOR ${FREERDP_VERSION_MINOR}
+#define FREERDP_VERSION_REVISION ${FREERDP_VERSION_REVISION}
+#define FREERDP_VERSION_SUFFIX "${FREERDP_VERSION_SUFFIX}"
+#define FREERDP_API_VERSION "${FREERDP_API_VERSION}"
+#define FREERDP_VERSION "${FREERDP_VERSION}"
+#define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}"
+#define GIT_REVISION "${GIT_REVISION}"
+
+#endif // _FREERDP_VERSION_H_
diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
index b0b865180..852743bac 100644
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@@ -39,6 +39,7 @@
 #include <freerdp/error.h>
 #include <freerdp/event.h>
 #include <freerdp/locale/keyboard.h>
+#include <freerdp/version.h>
 
 /* connectErrorCode is 'extern' in error.h. See comment there.*/