diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 3991531..348b136 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -14,7 +14,7 @@ TRACKER_PARSER_FILES =                \
        tracker-parser-libunistring.c
 
 tracker-parser-sha1.h: $(TRACKER_PARSER_FILES)
-       $(AM_V_GEN) echo -n "#define TRACKER_PARSER_SHA1 \""`git log -n1 --format=format:%H -- $(TRACKER_PARSER_FILES)`"\"" > $@
+       $(AM_V_GEN) echo $(ECHO_N) "#define TRACKER_PARSER_SHA1 \""`git log -n1 --format=format:%H -- $^`"\"$(ECHO_C)" > $@
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_common_LTLIBRARIES = libtracker-common.la
diff --git a/src/tracker/tracker-process.c b/src/tracker/tracker-process.c
index 4262bbe..b071a6d 100644
--- a/src/tracker/tracker-process.c
+++ b/src/tracker/tracker-process.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2010, Nokia <ivan.frade@nokia.com>
  * Copyright (C) 2014, Lanedo <martyn@lanedo.com>
+ * Copyright (C) 2016, RackTop <astormont@racktopsystems.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,6 +36,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef __sun
+#define _STRUCTURED_PROC 1
+#include <sys/procfs.h>
+#endif
+
 #include "tracker-process.h"
 
 static TrackerProcessData *