diff --git a/build/cmake/CMakeLists.txt b/CMakeLists.txt
similarity index 78%
rename from build/cmake/CMakeLists.txt
rename to CMakeLists.txt
index e04ee417..8bdb64e4 100644
--- a/build/cmake/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,24 @@
 project(nana)
 cmake_minimum_required(VERSION 2.8)
 
-string(REGEX REPLACE "/[^/]*$" "" CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
-string(REGEX REPLACE "/[^/]*$" "" CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+
+option(NANA_ENABLE_PNG "Enable the use of PNG" ON)
+if(NANA_ENABLE_PNG)
+	add_definitions(-DNANA_ENABLE_PNG)
+endif()
+
+option(NANA_LIBPNG "Use the system installed libpng" OFF)
+if(NANA_LIBPNG)
+	find_package(PNG)
+	if (PNG_FOUND)
+		include_directories( ${PNG_INCLUDE_DIRS})
+		add_definitions(-DNANA_LIBPNG)
+	endif()
+endif()
+
+#copy our new config.hpp (with removed PNG defines)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/build/cmake/config.hpp ${CMAKE_SOURCE_DIR}/include/nana/)
+
 
 set(NANA_SOURCE_DIR ${CMAKE_SOURCE_DIR}/source)
 set(NANA_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
diff --git a/build/cmake/config.hpp b/build/cmake/config.hpp
new file mode 100644
index 00000000..1436e7dc
--- /dev/null
+++ b/build/cmake/config.hpp
@@ -0,0 +1,50 @@
+/*
+ *	Nana Configuration
+ *	Nana C++ Library(http://www.nanapro.org)
+ *	Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
+ *
+ *	Distributed under the Boost Software License, Version 1.0.
+ *	(See accompanying file LICENSE_1_0.txt or copy at
+ *	http://www.boost.org/LICENSE_1_0.txt)
+ *
+ *	@file: nana/config.hpp
+ */
+
+#ifndef NANA_CONFIG_HPP
+#define NANA_CONFIG_HPP
+
+//Select platform automatically
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+//Windows:
+	#define NANA_WINDOWS	1
+	#define PLATFORM_SPEC_HPP <nana/detail/win32/platform_spec.hpp>
+
+	//Test if it is MINGW
+	#if defined(__MINGW32__)
+		#define NANA_MINGW
+		#define STD_CODECVT_NOT_SUPPORTED
+		//#define STD_THREAD_NOT_SUPPORTED	//Use this flag if MinGW version is older than 4.8.1
+	#endif
+#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
+//Linux:
+	#define NANA_LINUX	1
+	#define NANA_X11	1
+	#define PLATFORM_SPEC_HPP <nana/detail/linux_X11/platform_spec.hpp>
+	#define STD_CODECVT_NOT_SUPPORTED
+#endif
+
+//Here defines some flags that tell Nana what features will be supported.
+
+#define NANA_UNICODE
+
+#if defined(NANA_UNICODE) && defined(NANA_WINDOWS)
+	#ifndef _UNICODE
+		#define _UNICODE
+	#endif
+
+	#ifndef UNICODE
+		#define UNICODE
+	#endif
+#endif
+
+#endif	//NANA_CONFIG_HPP