diff --git a/cgminer.c b/cgminer.c
index d1de12f9..eba8f4c9 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -1422,6 +1422,8 @@ static bool submit_upstream_work(const struct work *work)
 		cgpu->accepted++;
 		total_accepted++;
 		pool->accepted++;
+		cgpu->last_share_pool = pool->pool_no;
+		cgpu->last_share_pool_time = time(NULL);
 		if (opt_debug)
 			applog(LOG_DEBUG, "PROOF OF WORK RESULT: true (yay!!!)");
 		if (!QUIET) {
diff --git a/miner.h b/miner.h
index 127af49b..a4a59cab 100644
--- a/miner.h
+++ b/miner.h
@@ -292,6 +292,8 @@ struct cgpu_info {
 	int gpu_powertune;
 	float gpu_vddc;
 #endif
+	int last_share_pool;
+	time_t last_share_pool_time;
 };
 
 #ifndef WIN32