diff --git a/Makefile.am b/Makefile.am
index 22c31f5..ea7ef22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ BUILT_SOURCES += version-info.h
 CLEANFILES += version-info.h
 
 version-info.h: ${top_srcdir}/version-info
-	${top_srcdir}/version-info ${top_srcdir} >$@
+	CC=${CC} ${top_srcdir}/version-info ${top_srcdir} >$@
 
 ########################################################################
 # Include automake stubs
diff --git a/bugreport/bugreport.c b/bugreport/bugreport.c
index 6548417..9bfecf9 100644
--- a/bugreport/bugreport.c
+++ b/bugreport/bugreport.c
@@ -76,6 +76,7 @@ int main(int argc, char **argv)
     printf("Package version: %s\n", VERSION);
     printf("Build version: %s\n", BUILD_VERSION);
     printf("Built on: %s\n", BUILD_HOST);
+    printf("Compiler: %s\n", BUILD_COMPILER);
     printf("Build date: %s\n", BUILD_DATE);
     printf("version-info %s\n", BUILD_VERSION_INFO_IDENT);
 
diff --git a/version-info b/version-info
index 857072b..00c2c9f 100755
--- a/version-info
+++ b/version-info
@@ -35,5 +35,6 @@ cat <<EOM
 #define BUILD_VERSION "${DESCRIBE}"
 #define BUILD_DATE "$(date +%Y-%m-%dT%H:%M:%S%z)"
 #define BUILD_HOST "$(uname -a)"
+#define BUILD_COMPILER "$(${CC} --version | head -n1)"
 EOM
 echo '#define BUILD_VERSION_INFO_IDENT "$Id$"'