diff --git a/include/common/memory.h b/include/common/memory.h
index bbac58d..410c97f 100644
--- a/include/common/memory.h
+++ b/include/common/memory.h
@@ -124,6 +124,10 @@
 	if ((p = pool->free_list) != NULL) {
 		pool->free_list = *POOL_LINK(pool, p);
 		pool->used++;
+#ifdef DEBUG_MEMORY_POOLS
+		/* keep track of where the element was allocated from */
+		*POOL_LINK(pool, p) = (void *)pool;
+#endif
 	}
 	return p;
 }
@@ -154,8 +158,16 @@
 	void *p;
 
 	p = pool_alloc_dirty(pool);
-	if (p && mem_poison_byte >= 0)
+#ifdef DEBUG_MEMORY_POOLS
+	if (p) {
+		/* keep track of where the element was allocated from */
+		*POOL_LINK(pool, p) = (void *)pool;
+	}
+#endif
+	if (p && mem_poison_byte >= 0) {
 		memset(p, mem_poison_byte, pool->size);
+	}
+
 	return p;
 }
 
@@ -171,6 +183,11 @@
 static inline void pool_free2(struct pool_head *pool, void *ptr)
 {
         if (likely(ptr != NULL)) {
+#ifdef DEBUG_MEMORY_POOLS
+		/* we'll get late corruption if we refill to the wrong pool or double-free */
+		if (*POOL_LINK(pool, ptr) != (void *)pool)
+			*(int *)0 = 0;
+#endif
 		*POOL_LINK(pool, ptr) = (void *)pool->free_list;
                 pool->free_list = (void *)ptr;
                 pool->used--;
diff --git a/src/memory.c b/src/memory.c
index 0363f36..691e1e3 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -116,6 +116,10 @@
 		pool->free_list = ptr;
 	}
 	pool->used++;
+#ifdef DEBUG_MEMORY_POOLS
+	/* keep track of where the element was allocated from */
+	*POOL_LINK(pool, ptr) = (void *)pool;
+#endif
 	return ptr;
 }