diff --git a/include/ucore/SConscript b/include/ucore/SConscript
index 5c5faf2..dfd44b2 100644
--- a/include/ucore/SConscript
+++ b/include/ucore/SConscript
@@ -1,12 +1,9 @@
 import os
+
 Import('env', 'build_type', 'prefix', 'version_info')
 
 ucore_env = env.Clone()
 
-#substitute @version_xx@ strings
-subst_version_info = dict(('@' + key + '@', version_info[key]) for key in version_info)
-ucore_env.Substfile('ucore_version.c.in', SUBST_DICT = subst_version_info)
-
 headers = ucore_env.Glob('*.h')
 
 #install targets
diff --git a/include/ucore/ucore_version.h b/include/ucore/ucore_version.h
index d4369e7..e33a37f 100644
--- a/include/ucore/ucore_version.h
+++ b/include/ucore/ucore_version.h
@@ -43,5 +43,8 @@ extern const int ucore_version_patch;
  * e.g. development version or similar*/
 extern const char ucore_version_str[];
 
+/** Hostname where the library was built
+ */
+extern const char ucore_build_host[];
 #endif
 
diff --git a/src/SConscript b/src/SConscript
index d7cc125..3f704bd 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,8 +1,15 @@
 import os
+import platform
+
 Import('env', 'build_type', 'prefix', 'version_info')
 
 ucore_env = env.Clone()
 
+#substitute @version_xx@ strings
+subst_version_info = dict(('@' + key + '@', version_info[key]) for key in version_info)
+subst_version_info['@build_host@'] = platform.node()
+ucore_env.Substfile('ucore_version.c.in', SUBST_DICT = subst_version_info)
+
 sources = ucore_env.Glob('*.c')
 
 #print 'ucore_env', dir(ucore_env)
diff --git a/include/ucore/ucore_version.c.in b/src/ucore_version.c.in
similarity index 63%
rename from include/ucore/ucore_version.c.in
rename to src/ucore_version.c.in
index 482684c..086b7e7 100644
--- a/include/ucore/ucore_version.c.in
+++ b/src/ucore_version.c.in
@@ -1,7 +1,10 @@
+//Various info about the version and build.
+//The SConscript file substitutes these at build time
 
 const int ucore_version_major = @version_major@;
 const int ucore_version_minor = @version_minor@;
 const int ucore_version_patch = @version_patch@;
 
 const char ucore_version_str[] = "@version_major@.@version_minor@.@version_patch@.@version_revision@";
+const char ucore_build_host[] = "@build_host@";