diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index bd259417..7a602cbc 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -112,8 +112,8 @@ ENDIF( ASCIIDOC_EXECUTABLE AND XMLTO_EXECUTABLE AND GZIP_EXECUTABLE )
 # Set awesome informations and path
 SET( AWESOME_VERSION_INTERNAL   devel )
 SET( AWESOME_COMPILE_MACHINE    ${CMAKE_SYSTEM_PROCESSOR} )
-SET( AWESOME_COMPILE_HOSTNAME   ${CMAKE_SYSTEM_NAME} )
-SET( AWESOME_COMPILE_BY         ${CMAKE_C_COMPILER} )
+SET( AWESOME_COMPILE_HOSTNAME   $ENV{HOSTNAME} )
+SET( AWESOME_COMPILE_BY         $ENV{USER} )
 SET( AWESOME_RELEASE            ${VERSION} )
 SET( AWESOME_ETC                ${CMAKE_INSTALL_PREFIX}/etc )
 SET( AWESOME_SHARE              ${CMAKE_INSTALL_PREFIX}/share )