--- a/driver/CMakeLists.txt	2012-08-16 12:15:30.000000000 -0700
+++ b/driver/CMakeLists.txt	2012-08-23 07:20:25.000000000 -0700
@@ -275,18 +275,37 @@
 	)
 ELSE(WIN32)
 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION lib@NAME@
+		ARCHIVE DESTINATION lib@NAME@
 	)
 ENDIF(WIN32)
 
 
 # Install some MySQL specific headers
 SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS
+		mysql_art_resultset.h
+		mysql_art_rset_metadata.h
 		mysql_connection.h
-		mysql_driver.h)
+		mysql_connection_data.h
+		mysql_connection_options.h
+		mysql_debug.h
+		mysql_driver.h
+		mysql_metadata.h
+		mysql_parameter_metadata.h
+		mysql_prepared_statement.h
+		mysql_ps_resultset.h
+		mysql_ps_resultset_metadata.h
+		mysql_public_iface.h
+		mysql_resultbind.h
+		mysql_resultset.h
+		mysql_resultset_metadata.h
+		mysql_statement.h
+		mysql_statement_options.h
+		mysql_uri.h
+		mysql_util.h
+		mysql_warning.h)
 
-INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include)
+INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include@NAME@/driver)
 
 
 MESSAGE(STATUS "Configuring driver")